diff --git a/lib/Makefile b/lib/Makefile
index 90912ca289fc..4fffb3778e73 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.89 1999/04/14 23:59:09 obrien Exp $
+# $FreeBSD$
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
diff --git a/lib/compat/Makefile b/lib/compat/Makefile
index c5022010a7e6..7d8bdfc58e12 100644
--- a/lib/compat/Makefile
+++ b/lib/compat/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1999/04/20 11:34:20 obrien Exp $
+# $FreeBSD$
 
 SUBDIR=
 
diff --git a/lib/compat/Makefile.inc b/lib/compat/Makefile.inc
index b7db7f364841..23e27116dac4 100644
--- a/lib/compat/Makefile.inc
+++ b/lib/compat/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id: Makefile.inc,v 1.4 1997/02/22 14:57:33 peter Exp $
+# $FreeBSD$
 
 LIBCOMPATDIR?=	${LIBDIR}/compat/aout
diff --git a/lib/compat/compat1x/Makefile b/lib/compat/compat1x/Makefile
index 2d7a9694aad0..07be405e8692 100644
--- a/lib/compat/compat1x/Makefile
+++ b/lib/compat/compat1x/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 1999/04/06 12:51:42 peter Exp $
+# $FreeBSD$
 
 DISTRIBUTION=	compat1x
 
diff --git a/lib/compat/compat20/Makefile b/lib/compat/compat20/Makefile
index 45446680bd7b..f416b3381b2b 100644
--- a/lib/compat/compat20/Makefile
+++ b/lib/compat/compat20/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 1999/04/06 12:51:43 peter Exp $
+# $FreeBSD$
 
 DISTRIBUTION=	compat20
 
diff --git a/lib/compat/compat21/Makefile b/lib/compat/compat21/Makefile
index 417de3cc564e..652bbb7252f4 100644
--- a/lib/compat/compat21/Makefile
+++ b/lib/compat/compat21/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 1999/04/06 12:51:43 peter Exp $
+# $FreeBSD$
 
 DISTRIBUTION=	compat21
 
diff --git a/lib/compat/compat22/Makefile b/lib/compat/compat22/Makefile
index 1abd61b8e33f..94457f359a91 100644
--- a/lib/compat/compat22/Makefile
+++ b/lib/compat/compat22/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1999/05/21 18:35:57 obrien Exp $
+# $FreeBSD$
 
 DISTRIBUTION=	compat22
 
diff --git a/lib/compat/compat3x.i386/Makefile b/lib/compat/compat3x.i386/Makefile
index c30d6ad53259..e78ee0021735 100644
--- a/lib/compat/compat3x.i386/Makefile
+++ b/lib/compat/compat3x.i386/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1999/04/20 11:32:09 obrien Exp $
+# $FreeBSD$
 
 DISTRIBUTION=	compat3x
 
diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index e7154eba9bc7..2c101c376318 100644
--- a/lib/csu/alpha/Makefile
+++ b/lib/csu/alpha/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.9 1999/04/24 02:07:17 jdp Exp $
+# $FreeBSD$
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c
diff --git a/lib/csu/alpha/crt1.c b/lib/csu/alpha/crt1.c
index f0cbed6afb77..095effc3a022 100644
--- a/lib/csu/alpha/crt1.c
+++ b/lib/csu/alpha/crt1.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.
  *
- *      $Id: crt1.c,v 1.5 1999/04/24 02:07:17 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef __GNUC__
diff --git a/lib/csu/alpha/crtbegin.c b/lib/csu/alpha/crtbegin.c
index ee88aa10ea29..4cb290318768 100644
--- a/lib/csu/alpha/crtbegin.c
+++ b/lib/csu/alpha/crtbegin.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crtbegin.c,v 1.3 1998/03/11 20:48:56 jb Exp $
+ * $FreeBSD$
  */
 
 typedef void (*fptr)(void);
diff --git a/lib/csu/alpha/crtend.c b/lib/csu/alpha/crtend.c
index b82bb0dbaf89..d6228a32433c 100644
--- a/lib/csu/alpha/crtend.c
+++ b/lib/csu/alpha/crtend.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crtend.c,v 1.1.1.1 1998/03/07 20:27:10 jdp Exp $
+ * $FreeBSD$
  */
 
 typedef void (*fptr)(void);
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
index 0fcd091e0088..50686fe05bd9 100644
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.4 1999/03/12 17:33:26 jdp Exp $
+# $FreeBSD$
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c crti.S crtn.S
diff --git a/lib/csu/amd64/crt1.c b/lib/csu/amd64/crt1.c
index d1dd43d0c361..0ee070227107 100644
--- a/lib/csu/amd64/crt1.c
+++ b/lib/csu/amd64/crt1.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crt1.c,v 1.2 1998/09/07 23:31:59 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef __GNUC__
diff --git a/lib/csu/amd64/crti.S b/lib/csu/amd64/crti.S
index 94e947d1d079..0038497e04ba 100644
--- a/lib/csu/amd64/crti.S
+++ b/lib/csu/amd64/crti.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.
  *
- *      $Id: crti.S,v 1.2 1997/08/28 00:27:08 jdp Exp $
+ * $FreeBSD$
  */
 
 	.section .init,"ax",@progbits
diff --git a/lib/csu/amd64/crtn.S b/lib/csu/amd64/crtn.S
index 8f280b26fd35..0944ee36761d 100644
--- a/lib/csu/amd64/crtn.S
+++ b/lib/csu/amd64/crtn.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.
  *
- *      $Id: crtn.S,v 1.2 1997/08/28 00:27:09 jdp Exp $
+ * $FreeBSD$
  */
 
 	.section .init,"ax",@progbits
diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c
index ddc8b807b9fe..7c1f11e4a010 100644
--- a/lib/csu/common/crtbegin.c
+++ b/lib/csu/common/crtbegin.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crtbegin.c,v 1.2 1999/03/12 17:33:27 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/csu/common/crtend.c b/lib/csu/common/crtend.c
index e681cd21e051..4b33f0c7bb4f 100644
--- a/lib/csu/common/crtend.c
+++ b/lib/csu/common/crtend.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crtend.c,v 1.1.1.1 1998/03/07 20:27:10 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile
index 0fcd091e0088..50686fe05bd9 100644
--- a/lib/csu/i386-elf/Makefile
+++ b/lib/csu/i386-elf/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.4 1999/03/12 17:33:26 jdp Exp $
+# $FreeBSD$
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c crti.S crtn.S
diff --git a/lib/csu/i386-elf/crt1.c b/lib/csu/i386-elf/crt1.c
index d1dd43d0c361..0ee070227107 100644
--- a/lib/csu/i386-elf/crt1.c
+++ b/lib/csu/i386-elf/crt1.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crt1.c,v 1.2 1998/09/07 23:31:59 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef __GNUC__
diff --git a/lib/csu/i386-elf/crtbegin.c b/lib/csu/i386-elf/crtbegin.c
index ddc8b807b9fe..7c1f11e4a010 100644
--- a/lib/csu/i386-elf/crtbegin.c
+++ b/lib/csu/i386-elf/crtbegin.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crtbegin.c,v 1.2 1999/03/12 17:33:27 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/csu/i386-elf/crtend.c b/lib/csu/i386-elf/crtend.c
index e681cd21e051..4b33f0c7bb4f 100644
--- a/lib/csu/i386-elf/crtend.c
+++ b/lib/csu/i386-elf/crtend.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crtend.c,v 1.1.1.1 1998/03/07 20:27:10 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/csu/i386-elf/crti.S b/lib/csu/i386-elf/crti.S
index 94e947d1d079..0038497e04ba 100644
--- a/lib/csu/i386-elf/crti.S
+++ b/lib/csu/i386-elf/crti.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.
  *
- *      $Id: crti.S,v 1.2 1997/08/28 00:27:08 jdp Exp $
+ * $FreeBSD$
  */
 
 	.section .init,"ax",@progbits
diff --git a/lib/csu/i386-elf/crtn.S b/lib/csu/i386-elf/crtn.S
index 8f280b26fd35..0944ee36761d 100644
--- a/lib/csu/i386-elf/crtn.S
+++ b/lib/csu/i386-elf/crtn.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.
  *
- *      $Id: crtn.S,v 1.2 1997/08/28 00:27:09 jdp Exp $
+ * $FreeBSD$
  */
 
 	.section .init,"ax",@progbits
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index d58be684afce..02f14f29d8ad 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-#	$Id: Makefile,v 1.38 1998/05/31 11:32:37 bde Exp $
+# $FreeBSD$
 
 CFLAGS+=        -DLIBC_SCCS -fno-omit-frame-pointer
 OBJS=		crt0.o c++rt0.o gcrt0.o scrt0.o sgcrt0.o
diff --git a/lib/csu/i386/c++rt0.c b/lib/csu/i386/c++rt0.c
index 413524f03ec1..39752d5b1c48 100644
--- a/lib/csu/i386/c++rt0.c
+++ b/lib/csu/i386/c++rt0.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: c++rt0.c,v 1.7 1997/02/22 14:57:42 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c
index 4989c5c55a44..e1a5551d5efc 100644
--- a/lib/csu/i386/crt0.c
+++ b/lib/csu/i386/crt0.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: crt0.c,v 1.34 1998/02/11 04:57:12 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index 2a7666135535..e5406486a8e3 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1999/02/27 02:16:01 brian Exp $
+# $FreeBSD$
 
 LIB=		alias
 SHLIB_MAJOR=	3
diff --git a/lib/libalias/alias.h b/lib/libalias/alias.h
index d3c2fd45c474..9666b0fb12be 100644
--- a/lib/libalias/alias.h
+++ b/lib/libalias/alias.h
@@ -7,7 +7,7 @@
     This software is placed into the public domain with no restrictions
     on its distribution.
 
-    $Id: alias.h,v 1.9 1999/02/27 02:16:01 brian Exp $
+ $FreeBSD$
 */
 
 
diff --git a/lib/libalias/alias_cuseeme.c b/lib/libalias/alias_cuseeme.c
index 7cb6d4ea4ee4..b1b95f49e0d4 100644
--- a/lib/libalias/alias_cuseeme.c
+++ b/lib/libalias/alias_cuseeme.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libalias/alias_nbt.c b/lib/libalias/alias_nbt.c
index 8b6e18012d58..b5afedf1ab56 100644
--- a/lib/libalias/alias_nbt.c
+++ b/lib/libalias/alias_nbt.c
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: alias_nbt.c,v 1.2 1998/12/14 02:25:32 dillon Exp $
+ * $FreeBSD$
  *
  *  TODO:
  *       oClean up. 
diff --git a/lib/libalias/libalias.3 b/lib/libalias/libalias.3
index ac252a682283..d57aa650b004 100644
--- a/lib/libalias/libalias.3
+++ b/lib/libalias/libalias.3
@@ -1,4 +1,4 @@
-.\" $Id: libalias.3,v 1.15 1999/08/15 09:50:59 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd July, 1997
 .Dt LIBALIAS 3 
diff --git a/lib/libatm/Makefile b/lib/libatm/Makefile
index d86f16ee8af9..218bf9f59af2 100644
--- a/lib/libatm/Makefile
+++ b/lib/libatm/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $Id: Makefile,v 1.1 1998/09/15 08:22:33 phk Exp $
+#	@(#) $FreeBSD$
 #
 #
 
diff --git a/lib/libatm/atm_addr.c b/lib/libatm/atm_addr.c
index 36a13f1f9851..a7a31783f306 100644
--- a/lib/libatm/atm_addr.c
+++ b/lib/libatm/atm_addr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_addr.c,v 1.2 1999/05/20 23:52:15 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -53,7 +53,7 @@
 #include "libatm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_addr.c,v 1.2 1999/05/20 23:52:15 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/lib/libatm/cache_key.c b/lib/libatm/cache_key.c
index df0328bb115a..582604c2875a 100644
--- a/lib/libatm/cache_key.c
+++ b/lib/libatm/cache_key.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: cache_key.c,v 1.1 1998/09/15 08:22:33 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -54,7 +54,7 @@
 #include "libatm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: cache_key.c,v 1.1 1998/09/15 08:22:33 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/lib/libatm/ioctl_subr.c b/lib/libatm/ioctl_subr.c
index 1cf598a95760..82a31b28d8da 100644
--- a/lib/libatm/ioctl_subr.c
+++ b/lib/libatm/ioctl_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ioctl_subr.c,v 1.1 1998/09/15 08:22:34 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -56,7 +56,7 @@
 #include "libatm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: ioctl_subr.c,v 1.1 1998/09/15 08:22:34 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/lib/libatm/ip_addr.c b/lib/libatm/ip_addr.c
index fbf60c4e0fae..81b9c771dc48 100644
--- a/lib/libatm/ip_addr.c
+++ b/lib/libatm/ip_addr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ip_addr.c,v 1.1 1998/09/15 08:22:34 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -54,7 +54,7 @@
 #include "libatm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: ip_addr.c,v 1.1 1998/09/15 08:22:34 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/lib/libatm/ip_checksum.c b/lib/libatm/ip_checksum.c
index 3cdf2f2bee28..b9c7fa85fa8a 100644
--- a/lib/libatm/ip_checksum.c
+++ b/lib/libatm/ip_checksum.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ip_checksum.c,v 1.1 1998/09/15 08:22:34 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -51,7 +51,7 @@
 #include "libatm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: ip_checksum.c,v 1.1 1998/09/15 08:22:34 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/lib/libatm/libatm.h b/lib/libatm/libatm.h
index 28ddbc289989..836b19e1f329 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.
  *
- *	@(#) $Id: libatm.h,v 1.1 1998/09/15 08:22:34 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/lib/libatm/timer.c b/lib/libatm/timer.c
index d2bae91c4195..e4828403c10f 100644
--- a/lib/libatm/timer.c
+++ b/lib/libatm/timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: timer.c,v 1.1 1998/09/15 08:22:34 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -54,7 +54,7 @@
 #include "libatm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: timer.c,v 1.1 1998/09/15 08:22:34 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 7f8dae320095..023da6b8bad5 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-#	$Id: Makefile,v 1.21 1998/03/09 06:16:38 jb Exp $
+# $FreeBSD$
 #
 # All library objects contain rcsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index b1a2e9824606..318ca70b8100 100644
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.3 1997/10/16 13:46:42 bde Exp $
+# $FreeBSD$
 #
 # This file contains make rules that are shared by libc and libc_r.
 #
diff --git a/lib/libc/alpha/Makefile.inc b/lib/libc/alpha/Makefile.inc
index 07cc51b31fd7..5a4d48e4a5d0 100644
--- a/lib/libc/alpha/Makefile.inc
+++ b/lib/libc/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.3 1998/08/08 02:14:45 jb Exp $
+# $FreeBSD$
 #
 # Machine dependent definitions for the alpha architecture.
 #
diff --git a/lib/libc/alpha/SYS.h b/lib/libc/alpha/SYS.h
index 01d114d2903a..6e0d52251b38 100644
--- a/lib/libc/alpha/SYS.h
+++ b/lib/libc/alpha/SYS.h
@@ -1,4 +1,4 @@
-/* $Id: SYS.h,v 1.4 1998/12/23 11:50:51 dfr Exp $ */
+/* $FreeBSD$ */
 /*	From: NetBSD: SYS.h,v 1.5 1997/05/02 18:15:15 kleink Exp */
 
 /*
diff --git a/lib/libc/alpha/gen/Makefile.inc b/lib/libc/alpha/gen/Makefile.inc
index cc7a87c10cff..4e7fb358cfb0 100644
--- a/lib/libc/alpha/gen/Makefile.inc
+++ b/lib/libc/alpha/gen/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.4 1998/08/17 03:38:54 jb Exp $
+# $FreeBSD$
 
 SRCS+=	_setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
 SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
diff --git a/lib/libc/alpha/gen/flt_rounds.c b/lib/libc/alpha/gen/flt_rounds.c
index 102a87d91f08..b6246c975169 100644
--- a/lib/libc/alpha/gen/flt_rounds.c
+++ b/lib/libc/alpha/gen/flt_rounds.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	From: NetBSD: flt_rounds.c,v 1.2 1997/07/18 00:30:30 thorpej Exp */
 
 /*
diff --git a/lib/libc/alpha/net/Makefile.inc b/lib/libc/alpha/net/Makefile.inc
index eb9f7c9401b1..b7178133b972 100644
--- a/lib/libc/alpha/net/Makefile.inc
+++ b/lib/libc/alpha/net/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 SRCS+=  htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/alpha/stdlib/Makefile.inc b/lib/libc/alpha/stdlib/Makefile.inc
index f852066020b7..dda8c76018d8 100644
--- a/lib/libc/alpha/stdlib/Makefile.inc
+++ b/lib/libc/alpha/stdlib/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id: Makefile.inc,v 1.1.1.1 1998/03/09 06:34:41 jb Exp $
+# $FreeBSD$
 
 MDSRCS+=	abs.c div.c labs.c ldiv.c
diff --git a/lib/libc/alpha/string/Makefile.inc b/lib/libc/alpha/string/Makefile.inc
index e67431912bee..7bbcc8de10e9 100644
--- a/lib/libc/alpha/string/Makefile.inc
+++ b/lib/libc/alpha/string/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 MDSRCS+=	bcopy.S bzero.S ffs.S memcpy.S memmove.S
diff --git a/lib/libc/alpha/sys/Makefile.inc b/lib/libc/alpha/sys/Makefile.inc
index 4886a866d5e3..51de27af9ffa 100644
--- a/lib/libc/alpha/sys/Makefile.inc
+++ b/lib/libc/alpha/sys/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.3 1998/08/17 03:36:16 jb Exp $
+# $FreeBSD$
 
 MDASM+=	Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S \
 	sbrk.S setlogin.S sigpending.S sigprocmask.S sigreturn.S \
diff --git a/lib/libc/alpha/sys/cerror.S b/lib/libc/alpha/sys/cerror.S
index 63771c0ffa08..e5b18f727e65 100644
--- a/lib/libc/alpha/sys/cerror.S
+++ b/lib/libc/alpha/sys/cerror.S
@@ -1,4 +1,4 @@
-/*	$Id: cerror.S,v 1.3 1998/12/23 11:50:51 dfr Exp $	*/
+/* $FreeBSD$	*/
 /*	From: NetBSD: cerror.S,v 1.4 1996/11/08 00:52:46 cgd Exp 	*/
 
 /*
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index f11fa8612889..a5daa1c12987 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -35,7 +35,7 @@
  *
  *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
  *
- *	$Id: SYS.h,v 1.11 1997/04/19 17:05:30 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/amd64/gen/Makefile.inc b/lib/libc/amd64/gen/Makefile.inc
index 5932d08f275d..f2506fdc6ae4 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
-#	$Id: Makefile.inc,v 1.8 1997/02/22 14:58:33 peter Exp $
+# $FreeBSD$
 
 SRCS+=	_setjmp.S alloca.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.S \
 	setjmp.S sigsetjmp.S
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index 4f1d2c7c15a2..39ad5accf47e 100644
--- a/lib/libc/amd64/gen/_setjmp.S
+++ b/lib/libc/amd64/gen/_setjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: _setjmp.S,v 1.6 1997/02/22 14:58:34 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: _setjmp.S,v 1.6 1997/02/22 14:58:34 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/amd64/gen/frexp.c b/lib/libc/amd64/gen/frexp.c
index aba48025ff5a..4834f1788095 100644
--- a/lib/libc/amd64/gen/frexp.c
+++ b/lib/libc/amd64/gen/frexp.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/amd64/gen/infinity.c b/lib/libc/amd64/gen/infinity.c
index e46f676a3f6d..ac92d46e7ea9 100644
--- a/lib/libc/amd64/gen/infinity.c
+++ b/lib/libc/amd64/gen/infinity.c
@@ -1,6 +1,6 @@
 /*
  * infinity.c
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <math.h>
diff --git a/lib/libc/amd64/gen/isinf.c b/lib/libc/amd64/gen/isinf.c
index a796dcf90697..b2b63a8f7274 100644
--- a/lib/libc/amd64/gen/isinf.c
+++ b/lib/libc/amd64/gen/isinf.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/amd64/gen/ldexp.c b/lib/libc/amd64/gen/ldexp.c
index 8b63f528dc8c..e7e58f05b2e0 100644
--- a/lib/libc/amd64/gen/ldexp.c
+++ b/lib/libc/amd64/gen/ldexp.c
@@ -33,11 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S
index 24884b19ebb3..0dfdde917b6d 100644
--- a/lib/libc/amd64/gen/setjmp.S
+++ b/lib/libc/amd64/gen/setjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: setjmp.S,v 1.7 1997/02/22 14:58:41 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: setjmp.S,v 1.7 1997/02/22 14:58:41 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S
index 8e4929494bf7..c3f98ff0f192 100644
--- a/lib/libc/amd64/gen/sigsetjmp.S
+++ b/lib/libc/amd64/gen/sigsetjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sigsetjmp.S,v 1.10 1997/02/22 14:58:43 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: sigsetjmp.S,v 1.10 1997/02/22 14:58:43 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/amd64/net/Makefile.inc b/lib/libc/amd64/net/Makefile.inc
index dff7fd1066b7..96e559bf8027 100644
--- a/lib/libc/amd64/net/Makefile.inc
+++ b/lib/libc/amd64/net/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 SRCS+=	htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/amd64/net/htonl.S b/lib/libc/amd64/net/htonl.S
index 095c40a6fa73..48f1ca8adcf9 100644
--- a/lib/libc/amd64/net/htonl.S
+++ b/lib/libc/amd64/net/htonl.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* netorder = htonl(hostorder) */
diff --git a/lib/libc/amd64/net/htons.S b/lib/libc/amd64/net/htons.S
index 238dfc24d36b..68f2b5a0131e 100644
--- a/lib/libc/amd64/net/htons.S
+++ b/lib/libc/amd64/net/htons.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* netorder = htons(hostorder) */
diff --git a/lib/libc/amd64/net/ntohl.S b/lib/libc/amd64/net/ntohl.S
index 5af5008c437b..7be9deebe26c 100644
--- a/lib/libc/amd64/net/ntohl.S
+++ b/lib/libc/amd64/net/ntohl.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* hostorder = ntohl(netorder) */
diff --git a/lib/libc/amd64/net/ntohs.S b/lib/libc/amd64/net/ntohs.S
index 4bed4a2c19c8..0f1d2280ce70 100644
--- a/lib/libc/amd64/net/ntohs.S
+++ b/lib/libc/amd64/net/ntohs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* hostorder = ntohs(netorder) */
diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc
index c85ada2b5cf3..30081e82ffc6 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
-#	$Id: Makefile.inc,v 1.12 1998/07/29 13:43:06 bde Exp $
+# $FreeBSD$
 
 SRCS+=	i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c i386_set_ldt.c \
 	i386_vm86.c
diff --git a/lib/libc/amd64/sys/brk.S b/lib/libc/amd64/sys/brk.S
index 4fdf0c637146..57266750efd3 100644
--- a/lib/libc/amd64/sys/brk.S
+++ b/lib/libc/amd64/sys/brk.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libc/amd64/sys/cerror.S
index d3e74eb9141c..31c3622bd200 100644
--- a/lib/libc/amd64/sys/cerror.S
+++ b/lib/libc/amd64/sys/cerror.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cerror.S,v 1.8 1997/02/22 14:59:29 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: cerror.S,v 1.8 1997/02/22 14:59:29 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/exect.S b/lib/libc/amd64/sys/exect.S
index af0d2ee391a3..9f90060fe156 100644
--- a/lib/libc/amd64/sys/exect.S
+++ b/lib/libc/amd64/sys/exect.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/pipe.S b/lib/libc/amd64/sys/pipe.S
index 637b86f9f0b1..1684611f766f 100644
--- a/lib/libc/amd64/sys/pipe.S
+++ b/lib/libc/amd64/sys/pipe.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/ptrace.S b/lib/libc/amd64/sys/ptrace.S
index 018a02cf94ed..7f5e149d33e7 100644
--- a/lib/libc/amd64/sys/ptrace.S
+++ b/lib/libc/amd64/sys/ptrace.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/reboot.S b/lib/libc/amd64/sys/reboot.S
index 70049b249b1d..4e39068fdff4 100644
--- a/lib/libc/amd64/sys/reboot.S
+++ b/lib/libc/amd64/sys/reboot.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/sbrk.S b/lib/libc/amd64/sys/sbrk.S
index a3afd8907900..f7aae351b00b 100644
--- a/lib/libc/amd64/sys/sbrk.S
+++ b/lib/libc/amd64/sys/sbrk.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/setlogin.S b/lib/libc/amd64/sys/setlogin.S
index 7bcf3bd886b3..a4d74b0d10cf 100644
--- a/lib/libc/amd64/sys/setlogin.S
+++ b/lib/libc/amd64/sys/setlogin.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/sigreturn.S b/lib/libc/amd64/sys/sigreturn.S
index 65deb40ab667..7405c340030e 100644
--- a/lib/libc/amd64/sys/sigreturn.S
+++ b/lib/libc/amd64/sys/sigreturn.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index 6a1d5b9aa86d..30d7fd1932b7 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: Ovfork.S,v 1.9 1998/09/13 20:32:45 luoqi Exp $
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: Ovfork.S,v 1.9 1998/09/13 20:32:45 luoqi Exp $"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index 54ebdab493c6..e90188244d1f 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
-#	$Id: Makefile.inc,v 1.7 1997/10/21 08:41:04 bde Exp $
+# $FreeBSD$
 
 # compat-43 sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43
diff --git a/lib/libc/compat-43/creat.2 b/lib/libc/compat-43/creat.2
index 07e2fa009bbb..7e9f099aa121 100644
--- a/lib/libc/compat-43/creat.2
+++ b/lib/libc/compat-43/creat.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)creat.2	8.1 (Berkeley) 6/2/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1993
 .Dt CREAT 2
diff --git a/lib/libc/compat-43/gethostid.3 b/lib/libc/compat-43/gethostid.3
index 5536d04820e2..df3644cfa222 100644
--- a/lib/libc/compat-43/gethostid.3
+++ b/lib/libc/compat-43/gethostid.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostid.3	8.1 (Berkeley) 6/2/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1993
 .Dt GETHOSTID 3
diff --git a/lib/libc/compat-43/killpg.2 b/lib/libc/compat-43/killpg.2
index 9d47326ce95f..365ab4b78c21 100644
--- a/lib/libc/compat-43/killpg.2
+++ b/lib/libc/compat-43/killpg.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)killpg.2	8.1 (Berkeley) 6/2/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1993
 .Dt KILLPG 2
diff --git a/lib/libc/compat-43/setruid.3 b/lib/libc/compat-43/setruid.3
index 9700ed2069f6..843a59f474cf 100644
--- a/lib/libc/compat-43/setruid.3
+++ b/lib/libc/compat-43/setruid.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setruid.3	8.1 (Berkeley) 6/2/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1993
 .Dt SETRUID 3
diff --git a/lib/libc/compat-43/sigblock.2 b/lib/libc/compat-43/sigblock.2
index c5f015ca2f0d..f7809b8f3d70 100644
--- a/lib/libc/compat-43/sigblock.2
+++ b/lib/libc/compat-43/sigblock.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigblock.2	8.1 (Berkeley) 6/2/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1993
 .Dt SIGBLOCK 2
diff --git a/lib/libc/compat-43/sigpause.2 b/lib/libc/compat-43/sigpause.2
index f376de882b78..166fda301a6e 100644
--- a/lib/libc/compat-43/sigpause.2
+++ b/lib/libc/compat-43/sigpause.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigpause.2	8.1 (Berkeley) 6/2/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1993
 .Dt SIGPAUSE 2
diff --git a/lib/libc/compat-43/sigsetmask.2 b/lib/libc/compat-43/sigsetmask.2
index ccebfd3f7701..ff1283d23c62 100644
--- a/lib/libc/compat-43/sigsetmask.2
+++ b/lib/libc/compat-43/sigsetmask.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigsetmask.2	8.1 (Berkeley) 6/2/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1993
 .Dt SIGSETMASK 2
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index 59602096ed67..f144efa34c4b 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigvec.2	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt SIGVEC 2
diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
index 518205cd2a1c..8bd4dd6d6305 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
-#	$Id$
+# $FreeBSD$
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc
index f373a214761d..33c630f5f499 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
-#	$Id$
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/db/btree
 
diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc
index a10f0fc32eaa..03cb1a835273 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
-#	$Id$
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/db/db
 
diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc
index 080a1a2f4c06..38b523d2c696 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
-#	$Id$
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/db/hash
 
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
index 2c70dd0760c9..149841335f26 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
-#	$Id: Makefile.inc,v 1.6 1997/10/16 14:26:09 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/db/man
 
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index 93762dc05c0b..9ce6d666adb5 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)btree.3	8.4 (Berkeley) 8/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH BTREE 3 "August 18, 1994"
 .\".UC 7
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index 6fce5ee2ed8b..defc687ce8b7 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH DBOPEN 3 "January 2, 1994"
 .UC 7
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index 16157baa2518..54e02ca1bd8b 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hash.3	8.6 (Berkeley) 8/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH HASH 3 "August 18, 1994"
 .UC 7
diff --git a/lib/libc/db/man/mpool.3 b/lib/libc/db/man/mpool.3
index e625dc4514b5..5174df60dc8b 100644
--- a/lib/libc/db/man/mpool.3
+++ b/lib/libc/db/man/mpool.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mpool.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH MPOOL 3 "June 4, 1993"
 .UC 7
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index 3e8b852c3e9b..84b7e25a1714 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)recno.3	8.5 (Berkeley) 8/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH RECNO 3 "August 18, 1994"
 .UC 7
diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc
index c8f2949a5523..461e62ae379e 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
-#	$Id$
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/db/mpool
 
diff --git a/lib/libc/db/mpool/mpool.libtp b/lib/libc/db/mpool/mpool.libtp
index dbb046919c04..bcd827dce29d 100644
--- a/lib/libc/db/mpool/mpool.libtp
+++ b/lib/libc/db/mpool/mpool.libtp
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-VERSION $Id$
+VERSION $FreeBSD$
 PACKAGE: 	User Level Shared Memory Manager
 
 DESCRIPTION: 	
diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc
index 5241fa53c934..295332e90c2d 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
-#	$Id$
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/db/recno
 
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index d7056940e3d4..ad2cf04e517b 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
-#	$Id: Makefile.inc,v 1.51 1999/04/07 02:59:47 jdp Exp $
+# $FreeBSD$
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen
diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c
index 25431d4f9a9b..944c2dc3b2ff 100644
--- a/lib/libc/gen/__xuname.c
+++ b/lib/libc/gen/__xuname.c
@@ -34,7 +34,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";*/
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/_spinlock_stub.c b/lib/libc/gen/_spinlock_stub.c
index a189eef7f2e1..e3a800d0e1c0 100644
--- a/lib/libc/gen/_spinlock_stub.c
+++ b/lib/libc/gen/_spinlock_stub.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: _spinlock_stub.c,v 1.2 1998/04/29 09:02:16 jb Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3
index 6dafe24bd01e..02651808d258 100644
--- a/lib/libc/gen/alarm.3
+++ b/lib/libc/gen/alarm.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)alarm.3	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt ALARM 3
diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3
index 672624bab845..d6844b430869 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
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 15, 1997
 .Dt ARC4RANDOM 3
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index b9f8a4846832..f331687e7470 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -1,4 +1,4 @@
-/* $Id: arc4random.c,v 1.1 1996/12/28 06:33:01 dm Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Arc4 random number generator for OpenBSD.
diff --git a/lib/libc/gen/clock.3 b/lib/libc/gen/clock.3
index 89ba150fe253..1d0f8fa8c822 100644
--- a/lib/libc/gen/clock.3
+++ b/lib/libc/gen/clock.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)clock.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CLOCK 3
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index 3534194a5c0b..6ba8e7c857bf 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)confstr.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CONFSTR 3
diff --git a/lib/libc/gen/crypt.3 b/lib/libc/gen/crypt.3
index ace61d6acc92..4a111f811855 100644
--- a/lib/libc/gen/crypt.3
+++ b/lib/libc/gen/crypt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)crypt.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt CRYPT 3
diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3
index e84563f9e388..e3da33ac64bf 100644
--- a/lib/libc/gen/ctermid.3
+++ b/lib/libc/gen/ctermid.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctermid.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CTERMID 3
diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3
index d3230f742ba5..fa423d6b8d50 100644
--- a/lib/libc/gen/daemon.3
+++ b/lib/libc/gen/daemon.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)daemon.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt DAEMON 3
diff --git a/lib/libc/gen/devname.3 b/lib/libc/gen/devname.3
index 7b0606f08d25..2030125efcc7 100644
--- a/lib/libc/gen/devname.3
+++ b/lib/libc/gen/devname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)devname.3	8.2 (Berkeley) 4/29/95
-.\"     $Id: devname.3,v 1.5 1999/07/20 20:48:40 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 29, 1995
 .Dt DEVNAME 3
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
index ff23026f99c3..23cd2f91d20b 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt DIRECTORY 3
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 93663c830591..82a3b3c270e1 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-	"$Id: disklabel.c,v 1.6 1997/03/11 11:52:25 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/dladdr.3 b/lib/libc/gen/dladdr.3
index 9cf704014ee8..9938a7a7107c 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.
 .\"
-.\"	$Id: dladdr.3,v 1.1 1998/02/09 06:05:24 jdp Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 5, 1998
 .Os FreeBSD
diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c
index d684fd980cb5..ff77b79d83f3 100644
--- a/lib/libc/gen/dlfcn.c
+++ b/lib/libc/gen/dlfcn.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dlfcn.c,v 1.2 1998/03/07 19:57:05 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index 7dd03fadb8d8..c1212c09a5fd 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
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd September 24, 1989
 .Os FreeBSD
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
index 97acb082485f..468fd1ff3bf5 100644
--- a/lib/libc/gen/err.3
+++ b/lib/libc/gen/err.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\"	$Id: err.3,v 1.9 1998/09/12 21:02:22 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd Mar 6, 1999
 .Dt ERR 3
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index ebb82f958931..6d1766c6ca30 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -34,7 +34,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 static const char rcsid[] =
-	"$Id: err.c,v 1.4 1998/09/12 21:02:22 wollman Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <err.h>
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index 66541ad0c4a4..8da1247adcfd 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exec.3	8.3 (Berkeley) 1/24/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 24, 1994
 .Dt EXEC 3
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index b3dd5f3e27da..af313a42714a 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: exec.c,v 1.11 1999/03/23 16:40:34 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index d9df325965f4..1231c75f48c9 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt FNMATCH 3
diff --git a/lib/libc/gen/frexp.3 b/lib/libc/gen/frexp.3
index 17fa729c6e15..f2a6b5c9f8d7 100644
--- a/lib/libc/gen/frexp.3
+++ b/lib/libc/gen/frexp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)frexp.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FREXP 3
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index dc67fb81a976..611bf3048f9a 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.
 .\"
-.\"	$Id: ftok.3,v 1.10 1998/06/10 04:24:18 jdp Exp $
+.\" $FreeBSD$
 .Dd June 24, 1994
 .Os
 .Dt FTOK 3
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 7942f82d5495..24cfe7d601e0 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -26,7 +26,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id: ftok.c,v 1.3 1997/02/22 15:06:10 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index 90fc844bc55b..6eacb38d928f 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
-.\"	$Id: fts.3,v 1.3 1997/03/09 00:43:49 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt FTS 3
diff --git a/lib/libc/gen/getbootfile.3 b/lib/libc/gen/getbootfile.3
index 3c2e78321ad4..1ad2b8eb81a6 100644
--- a/lib/libc/gen/getbootfile.3
+++ b/lib/libc/gen/getbootfile.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd September 23, 1994
 .Dt GETBOOTFILE 3
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index 5b293a7255f1..c2d155867ecb 100644
--- a/lib/libc/gen/getbootfile.c
+++ b/lib/libc/gen/getbootfile.c
@@ -34,7 +34,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";*/
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3
index 33a8b8035e9e..00b09c652ce1 100644
--- a/lib/libc/gen/getbsize.3
+++ b/lib/libc/gen/getbsize.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getbsize.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETBSIZE 3
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index c8954e981299..0e6a3da48587 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getcap.3	8.4 (Berkeley) 5/13/94
-.\"	$Id: getcap.3,v 1.9 1999/07/12 20:46:27 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 13, 1994
 .Dt GETCAP 3 
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index 55d50877d1b3..357fdf3fb31a 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getcwd.3	8.2 (Berkeley) 12/11/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd November 24, 1997
 .Dt GETCWD 3
diff --git a/lib/libc/gen/getdiskbyname.3 b/lib/libc/gen/getdiskbyname.3
index f6b7a3edcf70..14d88241ea3e 100644
--- a/lib/libc/gen/getdiskbyname.3
+++ b/lib/libc/gen/getdiskbyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getdiskbyname.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETDISKBYNAME 3
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index 75214d2270da..60a8099a2328 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 6, 1994
 .Dt GETDOMAINNAME 3
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index ba048032fd20..aafb01074559 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 */
 static const char rcsid[] =
-  "$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
index 18fd3614c608..98064fcea699 100644
--- a/lib/libc/gen/getfsent.3
+++ b/lib/libc/gen/getfsent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getfsent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETFSENT 3
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index a9f226a4a9f0..bb3cfb56298b 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getgrent.3	8.2 (Berkeley) 4/19/94
-.\"	$Id: getgrent.3,v 1.9 1997/02/22 14:58:07 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 29, 1994
 .Dt GETGRENT 3
diff --git a/lib/libc/gen/getgrouplist.3 b/lib/libc/gen/getgrouplist.3
index b8e305dd7628..e85eaa552ad2 100644
--- a/lib/libc/gen/getgrouplist.3
+++ b/lib/libc/gen/getgrouplist.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgrouplist.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt GETGROUPLIST 3
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index fa0631350176..f4d2d04055bc 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETHOSTNAME 3
diff --git a/lib/libc/gen/getloadavg.3 b/lib/libc/gen/getloadavg.3
index bd05349cc7a1..737f699fe79d 100644
--- a/lib/libc/gen/getloadavg.3
+++ b/lib/libc/gen/getloadavg.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getloadavg.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETLOADAVG 3
diff --git a/lib/libc/gen/getmntinfo.3 b/lib/libc/gen/getmntinfo.3
index b6fa04871a3b..d20fc5bbd67c 100644
--- a/lib/libc/gen/getmntinfo.3
+++ b/lib/libc/gen/getmntinfo.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getmntinfo.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt GETMNTINFO 3
diff --git a/lib/libc/gen/getnetgrent.3 b/lib/libc/gen/getnetgrent.3
index f1f541555c86..db8f550f2ba7 100644
--- a/lib/libc/gen/getnetgrent.3
+++ b/lib/libc/gen/getnetgrent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getnetgrent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETNETGRENT 3
diff --git a/lib/libc/gen/getobjformat.3 b/lib/libc/gen/getobjformat.3
index ad7ff438b234..3862d82a2b99 100644
--- a/lib/libc/gen/getobjformat.3
+++ b/lib/libc/gen/getobjformat.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: getobjformat.3,v 1.1 1998/09/09 01:21:24 jdp Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 7, 1998
 .Dt GETOBJFORMAT 3
diff --git a/lib/libc/gen/getobjformat.c b/lib/libc/gen/getobjformat.c
index c1e9915036d2..fa155a0c6751 100644
--- a/lib/libc/gen/getobjformat.c
+++ b/lib/libc/gen/getobjformat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
index 808e16b56e70..b6e91f49c349 100644
--- a/lib/libc/gen/getosreldate.c
+++ b/lib/libc/gen/getosreldate.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
 */
 static const char rcsid[] =
-  "$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getpagesize.3 b/lib/libc/gen/getpagesize.3
index 6accc054737d..549cfe7426b2 100644
--- a/lib/libc/gen/getpagesize.3
+++ b/lib/libc/gen/getpagesize.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpagesize.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETPAGESIZE 3
diff --git a/lib/libc/gen/getpass.3 b/lib/libc/gen/getpass.3
index 589bda9077c3..4fe263613a44 100644
--- a/lib/libc/gen/getpass.3
+++ b/lib/libc/gen/getpass.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpass.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETPASS 3
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index 2cd15a22b16a..57803dac5115 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getpwent.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd September 20, 1994
 .Dt GETPWENT 3
diff --git a/lib/libc/gen/getttyent.3 b/lib/libc/gen/getttyent.3
index 37566f773399..ab3ff1d6bed3 100644
--- a/lib/libc/gen/getttyent.3
+++ b/lib/libc/gen/getttyent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getttyent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1996
 .Dt GETTTYENT 3
diff --git a/lib/libc/gen/getusershell.3 b/lib/libc/gen/getusershell.3
index e86103e35976..62eaafa3efbb 100644
--- a/lib/libc/gen/getusershell.3
+++ b/lib/libc/gen/getusershell.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getusershell.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETUSERSHELL 3
diff --git a/lib/libc/gen/getvfsbyname.3 b/lib/libc/gen/getvfsbyname.3
index 888876aba550..c33fbea7da85 100644
--- a/lib/libc/gen/getvfsbyname.3
+++ b/lib/libc/gen/getvfsbyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getvfsbyname.3	8.3 (Berkeley) 5/4/95
-.\"     $Id: getvfsbyname.3,v 1.5 1999/07/12 20:46:33 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 4, 1995
 .Dt GETVFSBYNAME 3
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index 7f8a9703710a..a8f691320e72 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)kvm_getvfsbyname.c	8.1 (Berkeley) 4/3/95";
 #endif
 static const char rcsid[] =
-	"$Id: getvfsbyname.c,v 1.3 1998/03/09 04:36:07 jb Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getvfsent.3 b/lib/libc/gen/getvfsent.3
index c0e5934e65f8..127e0f345771 100644
--- a/lib/libc/gen/getvfsent.3
+++ b/lib/libc/gen/getvfsent.3
@@ -1,4 +1,4 @@
-.\"	$Id: getvfsent.3,v 1.15 1999/04/20 20:36:36 ghelmer Exp $
+.\" $FreeBSD$
 .\"	Written by Garrett A. Wollman, September 1994.
 .\"	This manual page is in the public domain.
 .\"
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index d9b730cedaa8..d99dc9fa5202 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)glob.3	8.3 (Berkeley) 4/16/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt GLOB 3
diff --git a/lib/libc/gen/initgroups.3 b/lib/libc/gen/initgroups.3
index d49edc7e468b..5ed1e06cf2c3 100644
--- a/lib/libc/gen/initgroups.3
+++ b/lib/libc/gen/initgroups.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)initgroups.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt INITGROUPS 3
diff --git a/lib/libc/gen/isinf.3 b/lib/libc/gen/isinf.3
index 94c184af360e..592bd044699d 100644
--- a/lib/libc/gen/isinf.3
+++ b/lib/libc/gen/isinf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isinf.3	8.2 (Berkeley) 1/29/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd January 29, 1994
 .Dt ISINF 3
diff --git a/lib/libc/gen/ldexp.3 b/lib/libc/gen/ldexp.3
index 3389ffbfa960..8a0ffef789d2 100644
--- a/lib/libc/gen/ldexp.3
+++ b/lib/libc/gen/ldexp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ldexp.3	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt LDEXP 3
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index 42a5cb40c2af..cb2f288065fa 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 19, 1997
 .Dt LOCKF 3
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
index 391f3a652fcf..3363d588a96d 100644
--- a/lib/libc/gen/lockf.c
+++ b/lib/libc/gen/lockf.c
@@ -38,7 +38,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char rcsid[]=
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/lib/libc/gen/modf.3 b/lib/libc/gen/modf.3
index ea185966e1ff..c2941a840e0c 100644
--- a/lib/libc/gen/modf.3
+++ b/lib/libc/gen/modf.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)modf.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MODF 3
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index 8570565a3868..326e8a521bc1 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.
 .\"
-.\"	$Id: msgctl.3,v 1.5 1997/11/23 17:58:36 bde Exp $
+.\" $FreeBSD$
 .\"/
 .Dd November 24, 1997
 .Dt MSGCTL 3
diff --git a/lib/libc/gen/msgget.3 b/lib/libc/gen/msgget.3
index b4cc735eb5ce..f68cd8afcb4a 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.
-.\"     $Id: msgget.3,v 1.5 1999/07/12 20:46:37 nik Exp $
+.\" $FreeBSD$
 .\"
 .\"/
 .Dd August 17, 1995
diff --git a/lib/libc/gen/msgrcv.3 b/lib/libc/gen/msgrcv.3
index fd154204d51e..e4aa45d19fea 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.
-.\"	$Id: msgrcv.3,v 1.5 1997/11/23 17:58:38 bde Exp $
+.\" $FreeBSD$
 .\"
 .\"/
 .Dd November 24, 1997
diff --git a/lib/libc/gen/msgsnd.3 b/lib/libc/gen/msgsnd.3
index f54b8aec03aa..8946c1c52163 100644
--- a/lib/libc/gen/msgsnd.3
+++ b/lib/libc/gen/msgsnd.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.
-.\"	$Id: msgsnd.3,v 1.4 1997/11/23 17:58:40 bde Exp $
+.\" $FreeBSD$
 .\"
 .\"/
 .Dd November 24, 1997
diff --git a/lib/libc/gen/nice.3 b/lib/libc/gen/nice.3
index 95edd11c6216..d61ec2ec8963 100644
--- a/lib/libc/gen/nice.3
+++ b/lib/libc/gen/nice.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nice.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt NICE 3
diff --git a/lib/libc/gen/nlist.3 b/lib/libc/gen/nlist.3
index 41999be7632f..69add4af889b 100644
--- a/lib/libc/gen/nlist.3
+++ b/lib/libc/gen/nlist.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nlist.3	8.3 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt NLIST 3
diff --git a/lib/libc/gen/ntp_gettime.c b/lib/libc/gen/ntp_gettime.c
index 4e76e85d0760..3bb71c136797 100644
--- a/lib/libc/gen/ntp_gettime.c
+++ b/lib/libc/gen/ntp_gettime.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char rcsid[] =
-  "$Id: ntp_gettime.c,v 1.4 1997/02/22 14:58:12 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/pause.3 b/lib/libc/gen/pause.3
index 962c6cb76dad..e48bc8ead26e 100644
--- a/lib/libc/gen/pause.3
+++ b/lib/libc/gen/pause.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pause.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt PAUSE 3
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
index ea7bdde419e2..53004c05d0da 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)popen.3	8.2 (Berkeley) 5/3/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd May 3, 1995
 .Dt POPEN 3
diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3
index 91621a71f73e..325f8ec3daf5 100644
--- a/lib/libc/gen/psignal.3
+++ b/lib/libc/gen/psignal.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)psignal.3	8.2 (Berkeley) 2/27/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 27, 1995
 .Dt PSIGNAL 3
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index 1935d33f940a..d5f08a2e9e3d 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwcache.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt PWCACHE 3
diff --git a/lib/libc/gen/raise.3 b/lib/libc/gen/raise.3
index 85de2b05e55c..556ad2ad9a4d 100644
--- a/lib/libc/gen/raise.3
+++ b/lib/libc/gen/raise.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)raise.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RAISE 3
diff --git a/lib/libc/gen/rand48.3 b/lib/libc/gen/rand48.3
index fe06cf0bd7ba..86e7a2ffcc1c 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
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd October 8, 1993
 .Dt RAND48 3
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index 1b1628753474..afcde28ea5a9 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)scandir.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SCANDIR 3
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index b7021a5db3a2..8d461662f366 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)sethostname.c	8.1 (Berkeley) 6/4/93";
 */
 static const char rcsid[] =
-  "$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/setjmp.3 b/lib/libc/gen/setjmp.3
index 680781d18655..779239cab525 100644
--- a/lib/libc/gen/setjmp.3
+++ b/lib/libc/gen/setjmp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setjmp.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SETJMP 3
diff --git a/lib/libc/gen/setmode.3 b/lib/libc/gen/setmode.3
index 2fdb0337216a..20a26fefcb46 100644
--- a/lib/libc/gen/setmode.3
+++ b/lib/libc/gen/setmode.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt SETMODE 3
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index 25e91621deb8..96f1ebf91378 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.
 .\"
-.\" $Id: setproctitle.3,v 1.9 1997/05/11 08:50:33 davidn Exp $
+.\" $FreeBSD$
 .\"
 .\" 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 3bce42074da8..a5cf2347e50c 100644
--- a/lib/libc/gen/setproctitle.c
+++ b/lib/libc/gen/setproctitle.c
@@ -14,7 +14,7 @@
  * 3. Absolutely no warranty of function or purpose is made by the author
  *    Peter Wemm.
  *
- * $Id: setproctitle.c,v 1.7 1998/04/28 07:02:33 dg Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/shmat.c b/lib/libc/gen/shmat.c
index 1cd07795065f..45b91430c944 100644
--- a/lib/libc/gen/shmat.c
+++ b/lib/libc/gen/shmat.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id$";
+static char *rcsid = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/shmctl.c b/lib/libc/gen/shmctl.c
index b0585fdc9530..eae9fbb6a23f 100644
--- a/lib/libc/gen/shmctl.c
+++ b/lib/libc/gen/shmctl.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id$";
+static char *rcsid = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/shmdt.c b/lib/libc/gen/shmdt.c
index feae3d114d87..f39ad183f2ab 100644
--- a/lib/libc/gen/shmdt.c
+++ b/lib/libc/gen/shmdt.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id$";
+static char *rcsid = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/shmget.c b/lib/libc/gen/shmget.c
index 011951163541..8976d1c0d6d4 100644
--- a/lib/libc/gen/shmget.c
+++ b/lib/libc/gen/shmget.c
@@ -1,5 +1,5 @@
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id$";
+static char *rcsid = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/siginterrupt.3 b/lib/libc/gen/siginterrupt.3
index d93915a64789..ffce99ca336f 100644
--- a/lib/libc/gen/siginterrupt.3
+++ b/lib/libc/gen/siginterrupt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)siginterrupt.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SIGINTERRUPT 3
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index 223186c692c2..67146fc62690 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)signal.3	8.3 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt SIGNAL 3
diff --git a/lib/libc/gen/sigsetops.3 b/lib/libc/gen/sigsetops.3
index 7550c38405bd..a32daf68cf80 100644
--- a/lib/libc/gen/sigsetops.3
+++ b/lib/libc/gen/sigsetops.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigsetops.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SIGSETOPS 3
diff --git a/lib/libc/gen/sleep.3 b/lib/libc/gen/sleep.3
index 02ceb6792158..e59aad5113b9 100644
--- a/lib/libc/gen/sleep.3
+++ b/lib/libc/gen/sleep.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\"     $Id: sleep.3,v 1.10 1998/01/13 04:32:00 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd Feb 13, 1998
 .Dt SLEEP 3
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index faedfa9ce268..f87ffba1f951 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sleep.c	8.1 (Berkeley) 6/4/93";
 #endif
 static char rcsid[] =
-	"$Id: sleep.c,v 1.23 1998/09/05 08:01:26 jb Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/gen/stringlist.3 b/lib/libc/gen/stringlist.3
index a489c1991e2c..21fb2db59968 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 24, 1997
 .Os NetBSD 1.3
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 4350a10ef0e5..e18c045c26cf 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysconf.3	8.3 (Berkeley) 4/19/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt SYSCONF 3
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 880cfe4f4385..129a125ba3c4 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 9, 1995
 .Dt SYSCTL 3
diff --git a/lib/libc/gen/sysctlbyname.c b/lib/libc/gen/sysctlbyname.c
index 0e6720740795..3d19ca2cdc9b 100644
--- a/lib/libc/gen/sysctlbyname.c
+++ b/lib/libc/gen/sysctlbyname.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: sysctlbyname.c,v 1.2 1997/07/12 11:14:30 peter Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index f0bf35e4a279..a53ba1dc6e66 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.3	8.1 (Berkeley) 6/4/93
-.\"     $Id: syslog.3,v 1.5 1999/07/12 20:46:45 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SYSLOG 3
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index e8890f231e93..3a9eca466809 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
 */
 static const char rcsid[] =
-  "$Id: syslog.c,v 1.16 1998/03/06 03:10:49 brian Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/tcgetpgrp.3 b/lib/libc/gen/tcgetpgrp.3
index 87b7a6df72e6..7a026b78eff9 100644
--- a/lib/libc/gen/tcgetpgrp.3
+++ b/lib/libc/gen/tcgetpgrp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcgetpgrp.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TCGETPGRP 3
diff --git a/lib/libc/gen/tcsendbreak.3 b/lib/libc/gen/tcsendbreak.3
index adb8eed4738e..6b5f754ac235 100644
--- a/lib/libc/gen/tcsendbreak.3
+++ b/lib/libc/gen/tcsendbreak.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsendbreak.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TCSENDBREAK 3
diff --git a/lib/libc/gen/tcsetattr.3 b/lib/libc/gen/tcsetattr.3
index 582d1e43f1ec..b5c6fd9f04cd 100644
--- a/lib/libc/gen/tcsetattr.3
+++ b/lib/libc/gen/tcsetattr.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsetattr.3	8.3 (Berkeley) 1/2/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 2, 1994
 .Dt TCSETATTR 3
diff --git a/lib/libc/gen/tcsetpgrp.3 b/lib/libc/gen/tcsetpgrp.3
index 0d4f7ba4fe1b..3da2cd14c3a4 100644
--- a/lib/libc/gen/tcsetpgrp.3
+++ b/lib/libc/gen/tcsetpgrp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tcsetpgrp.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TCSETPGRP 3
diff --git a/lib/libc/gen/time.3 b/lib/libc/gen/time.3
index d511c4bb5872..71c198246abc 100644
--- a/lib/libc/gen/time.3
+++ b/lib/libc/gen/time.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TIME 3
diff --git a/lib/libc/gen/times.3 b/lib/libc/gen/times.3
index f99bc6807738..b971e2d39c78 100644
--- a/lib/libc/gen/times.3
+++ b/lib/libc/gen/times.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)times.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TIMES 3
diff --git a/lib/libc/gen/timezone.3 b/lib/libc/gen/timezone.3
index ccbb6568e939..7468aa419fbb 100644
--- a/lib/libc/gen/timezone.3
+++ b/lib/libc/gen/timezone.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)timezone.3	8.2 (Berkeley) 4/19/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt TIMEZONE 3
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index 686e12870977..719b9fb7365a 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ttyname.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TTYNAME 3
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index 3857b6ceb143..853a1da7de12 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tzset.3	8.2 (Berkeley) 11/17/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt TZSET 3
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
index e6b14f55395e..bbf9457fdfd9 100644
--- a/lib/libc/gen/ualarm.3
+++ b/lib/libc/gen/ualarm.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ualarm.3	8.2 (Berkeley) 4/19/94
-.\"     $Id: ualarm.3,v 1.7 1997/08/14 07:44:56 ache Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt UALARM 3
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index 97f7333efc68..6a3aef6d970f 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uname.3	8.1 (Berkeley) 1/4/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 4, 1994
 .Dt UNAME 3
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index 25431d4f9a9b..944c2dc3b2ff 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -34,7 +34,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";*/
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3
index 40269dfbac5a..16734d13b37d 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unvis.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt UNVIS 3
diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3
index 0b2492940e4e..77d625965a3a 100644
--- a/lib/libc/gen/usleep.3
+++ b/lib/libc/gen/usleep.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)usleep.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd Feb 13, 1998
 .Dt USLEEP 3
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index 4abe2910b823..4b6c67d9af62 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)usleep.c	8.1 (Berkeley) 6/4/93";
 #endif
 static char rcsid[] =
-	"$Id: usleep.c,v 1.21 1997/10/22 12:04:49 ache Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <time.h>
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index 968fc6502047..b8d66fd0dafb 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utime.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt UTIME 3
diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3
index 448918729093..e97d1f3cd18a 100644
--- a/lib/libc/gen/valloc.3
+++ b/lib/libc/gen/valloc.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)valloc.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt VALLOC 3
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index f749573e5c89..e8860b091145 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)vis.3	8.1 (Berkeley) 6/9/93
-.\"	$Id: vis.3,v 1.6 1997/02/22 14:58:21 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 25, 1996
 .Dt VIS 3
diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc
index b83c767e8bff..1b8a90629204 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
-#	$Id: Makefile.inc,v 1.5 1997/10/15 16:15:29 bde Exp $
+# $FreeBSD$
 
 # gmon sources
 .PATH: ${.CURDIR}/../libc/gmon
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index 18f9975823b5..b27b3868c790 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: mcount.c,v 1.14 1998/09/05 07:57:43 jb Exp $";
+  "$FreeBSD$";
 #endif
 
 #include <sys/param.h>
diff --git a/lib/libc/gmon/moncontrol.3 b/lib/libc/gmon/moncontrol.3
index 37f14b7aca3d..f608f8fbce31 100644
--- a/lib/libc/gmon/moncontrol.3
+++ b/lib/libc/gmon/moncontrol.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)moncontrol.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MONCONTROL 3
diff --git a/lib/libc/i386/DEFS.h b/lib/libc/i386/DEFS.h
index fbc11bc7239a..edf08ea12379 100644
--- a/lib/libc/i386/DEFS.h
+++ b/lib/libc/i386/DEFS.h
@@ -35,7 +35,7 @@
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
  *
- *	$Id: DEFS.h,v 1.6 1997/02/22 14:58:29 peter Exp $
+ * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index f11fa8612889..a5daa1c12987 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -35,7 +35,7 @@
  *
  *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
  *
- *	$Id: SYS.h,v 1.11 1997/04/19 17:05:30 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/syscall.h>
diff --git a/lib/libc/i386/gen/Makefile.inc b/lib/libc/i386/gen/Makefile.inc
index 5932d08f275d..f2506fdc6ae4 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
-#	$Id: Makefile.inc,v 1.8 1997/02/22 14:58:33 peter Exp $
+# $FreeBSD$
 
 SRCS+=	_setjmp.S alloca.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.S \
 	setjmp.S sigsetjmp.S
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index 4f1d2c7c15a2..39ad5accf47e 100644
--- a/lib/libc/i386/gen/_setjmp.S
+++ b/lib/libc/i386/gen/_setjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: _setjmp.S,v 1.6 1997/02/22 14:58:34 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: _setjmp.S,v 1.6 1997/02/22 14:58:34 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S
index f76b37bc1a15..4aa0e321b9e7 100644
--- a/lib/libc/i386/gen/alloca.S
+++ b/lib/libc/i386/gen/alloca.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* like alloc, but automatic automatic free in return */
diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S
index 5ae53705ffa6..578cf7cd5a9c 100644
--- a/lib/libc/i386/gen/fabs.S
+++ b/lib/libc/i386/gen/fabs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/gen/frexp.c b/lib/libc/i386/gen/frexp.c
index aba48025ff5a..4834f1788095 100644
--- a/lib/libc/i386/gen/frexp.c
+++ b/lib/libc/i386/gen/frexp.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/i386/gen/infinity.c b/lib/libc/i386/gen/infinity.c
index e46f676a3f6d..ac92d46e7ea9 100644
--- a/lib/libc/i386/gen/infinity.c
+++ b/lib/libc/i386/gen/infinity.c
@@ -1,6 +1,6 @@
 /*
  * infinity.c
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <math.h>
diff --git a/lib/libc/i386/gen/isinf.c b/lib/libc/i386/gen/isinf.c
index a796dcf90697..b2b63a8f7274 100644
--- a/lib/libc/i386/gen/isinf.c
+++ b/lib/libc/i386/gen/isinf.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/i386/gen/ldexp.c b/lib/libc/i386/gen/ldexp.c
index 8b63f528dc8c..e7e58f05b2e0 100644
--- a/lib/libc/i386/gen/ldexp.c
+++ b/lib/libc/i386/gen/ldexp.c
@@ -33,11 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S
index b457097c8257..751ec1ca4f10 100644
--- a/lib/libc/i386/gen/modf.S
+++ b/lib/libc/i386/gen/modf.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index 24884b19ebb3..0dfdde917b6d 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: setjmp.S,v 1.7 1997/02/22 14:58:41 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: setjmp.S,v 1.7 1997/02/22 14:58:41 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index 8e4929494bf7..c3f98ff0f192 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sigsetjmp.S,v 1.10 1997/02/22 14:58:43 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: sigsetjmp.S,v 1.10 1997/02/22 14:58:43 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/net/Makefile.inc b/lib/libc/i386/net/Makefile.inc
index dff7fd1066b7..96e559bf8027 100644
--- a/lib/libc/i386/net/Makefile.inc
+++ b/lib/libc/i386/net/Makefile.inc
@@ -1,4 +1,4 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 SRCS+=	htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/i386/net/htonl.S b/lib/libc/i386/net/htonl.S
index 095c40a6fa73..48f1ca8adcf9 100644
--- a/lib/libc/i386/net/htonl.S
+++ b/lib/libc/i386/net/htonl.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* netorder = htonl(hostorder) */
diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S
index 238dfc24d36b..68f2b5a0131e 100644
--- a/lib/libc/i386/net/htons.S
+++ b/lib/libc/i386/net/htons.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* netorder = htons(hostorder) */
diff --git a/lib/libc/i386/net/ntohl.S b/lib/libc/i386/net/ntohl.S
index 5af5008c437b..7be9deebe26c 100644
--- a/lib/libc/i386/net/ntohl.S
+++ b/lib/libc/i386/net/ntohl.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* hostorder = ntohl(netorder) */
diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S
index 4bed4a2c19c8..0f1d2280ce70 100644
--- a/lib/libc/i386/net/ntohs.S
+++ b/lib/libc/i386/net/ntohs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /* hostorder = ntohs(netorder) */
diff --git a/lib/libc/i386/stdlib/Makefile.inc b/lib/libc/i386/stdlib/Makefile.inc
index 16a903916f19..0a6a6a89237c 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
-#	$Id: Makefile.inc,v 1.5 1997/02/22 14:58:55 peter Exp $
+# $FreeBSD$
 
 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 4915d16641b5..e4812d8547ad 100644
--- a/lib/libc/i386/stdlib/abs.S
+++ b/lib/libc/i386/stdlib/abs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S
index b2a9901fe639..a9ff515e90f7 100644
--- a/lib/libc/i386/stdlib/div.S
+++ b/lib/libc/i386/stdlib/div.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S
index 5c5afe142bbc..6fa814939d41 100644
--- a/lib/libc/i386/stdlib/labs.S
+++ b/lib/libc/i386/stdlib/labs.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S
index 38cdf3f5631d..c9546c379a8f 100644
--- a/lib/libc/i386/stdlib/ldiv.S
+++ b/lib/libc/i386/stdlib/ldiv.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc
index 0a3ccdb62631..1b2de19a83df 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
-#	$Id: Makefile.inc,v 1.7 1997/04/20 12:46:11 bde Exp $
+# $FreeBSD$
 
 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 1c0c9347234b..3c0bd02eb9b8 100644
--- a/lib/libc/i386/string/bcmp.S
+++ b/lib/libc/i386/string/bcmp.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S
index 8cc8f9fd5f95..7f95f712ee98 100644
--- a/lib/libc/i386/string/bzero.S
+++ b/lib/libc/i386/string/bzero.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S
index 084115b17faf..ae4be791ce03 100644
--- a/lib/libc/i386/string/ffs.S
+++ b/lib/libc/i386/string/ffs.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S
index 0a6c6a3771a4..d63a646e953a 100644
--- a/lib/libc/i386/string/index.S
+++ b/lib/libc/i386/string/index.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
index cc2dc7677ec2..9604f595a933 100644
--- a/lib/libc/i386/string/memchr.S
+++ b/lib/libc/i386/string/memchr.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S
index a362533ac3b8..e4fd4a734868 100644
--- a/lib/libc/i386/string/memcmp.S
+++ b/lib/libc/i386/string/memcmp.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S
index 5db1661feb7b..bb9e268d16dc 100644
--- a/lib/libc/i386/string/memset.S
+++ b/lib/libc/i386/string/memset.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S
index 6e023d16323e..dd15865383a6 100644
--- a/lib/libc/i386/string/rindex.S
+++ b/lib/libc/i386/string/rindex.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S
index 9ec605342def..ceda0102c79f 100644
--- a/lib/libc/i386/string/strcat.S
+++ b/lib/libc/i386/string/strcat.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index a483edd6fb0c..16fa724ca20a 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S
index ecdb0b079bfd..28a3f2f5e5cd 100644
--- a/lib/libc/i386/string/strcmp.S
+++ b/lib/libc/i386/string/strcmp.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S
index d8e673aa7b83..5a304149513c 100644
--- a/lib/libc/i386/string/strcpy.S
+++ b/lib/libc/i386/string/strcpy.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S
index 93190cf29671..eedc96962f98 100644
--- a/lib/libc/i386/string/strlen.S
+++ b/lib/libc/i386/string/strlen.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S
index 62686dc42274..0efc6aca6ed5 100644
--- a/lib/libc/i386/string/strncmp.S
+++ b/lib/libc/i386/string/strncmp.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index 0cc08d76fafe..d62039f31d04 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-        .asciz "$Id$"
+        .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
index 717b7a2f2081..80578afcf5cc 100644
--- a/lib/libc/i386/string/swab.S
+++ b/lib/libc/i386/string/swab.S
@@ -27,12 +27,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index c85ada2b5cf3..30081e82ffc6 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
-#	$Id: Makefile.inc,v 1.12 1998/07/29 13:43:06 bde Exp $
+# $FreeBSD$
 
 SRCS+=	i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c i386_set_ldt.c \
 	i386_vm86.c
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index 6a1d5b9aa86d..30d7fd1932b7 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: Ovfork.S,v 1.9 1998/09/13 20:32:45 luoqi Exp $
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: Ovfork.S,v 1.9 1998/09/13 20:32:45 luoqi Exp $"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S
index 4fdf0c637146..57266750efd3 100644
--- a/lib/libc/i386/sys/brk.S
+++ b/lib/libc/i386/sys/brk.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S
index d3e74eb9141c..31c3622bd200 100644
--- a/lib/libc/i386/sys/cerror.S
+++ b/lib/libc/i386/sys/cerror.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cerror.S,v 1.8 1997/02/22 14:59:29 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: cerror.S,v 1.8 1997/02/22 14:59:29 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S
index af0d2ee391a3..9f90060fe156 100644
--- a/lib/libc/i386/sys/exect.S
+++ b/lib/libc/i386/sys/exect.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/fork.S b/lib/libc/i386/sys/fork.S
index ab908a95dba7..6c3cde8a2772 100644
--- a/lib/libc/i386/sys/fork.S
+++ b/lib/libc/i386/sys/fork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/i386_get_ioperm.2 b/lib/libc/i386/sys/i386_get_ioperm.2
index 7d3c7f68b3b3..2d326b88fc7d 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.
 .\"
-.\"	$Id: i386_get_ioperm.2,v 1.1 1998/07/28 03:39:02 jlemon Exp $
+.\" $FreeBSD$
 .\"
 .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 2504b2cb1b15..f49ae2eb8d57 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.c
+++ b/lib/libc/i386/sys/i386_get_ioperm.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i386_get_ioperm.c,v 1.1 1998/07/28 03:39:03 jlemon Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id: i386_get_ioperm.c,v 1.1 1998/07/28 03:39:03 jlemon Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #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 7c6231e75d37..fce57b65c853 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fork.2	6.5 (Berkeley) 3/10/91
-.\"	$Id: i386_get_ldt.2,v 1.4 1998/06/04 21:05:40 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 20, 1993
 .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 628052b7af64..11bbd8d30090 100644
--- a/lib/libc/i386/sys/i386_get_ldt.c
+++ b/lib/libc/i386/sys/i386_get_ldt.c
@@ -25,11 +25,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/cdefs.h>
diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
index 11f4caab4d67..c7812edd82d5 100644
--- a/lib/libc/i386/sys/i386_set_ioperm.c
+++ b/lib/libc/i386/sys/i386_set_ioperm.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i386_set_ioperm.c,v 1.1 1998/07/28 03:39:03 jlemon Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id: i386_set_ioperm.c,v 1.1 1998/07/28 03:39:03 jlemon Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #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 6a54b301ab0f..bcde553e503f 100644
--- a/lib/libc/i386/sys/i386_set_ldt.c
+++ b/lib/libc/i386/sys/i386_set_ldt.c
@@ -25,11 +25,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/cdefs.h>
diff --git a/lib/libc/i386/sys/i386_vm86.2 b/lib/libc/i386/sys/i386_vm86.2
index 5094bc7a9c33..4dc0d52adbe3 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.
 .\"
-.\"	$Id: i386_vm86.2,v 1.1 1998/07/28 03:39:03 jlemon Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 27, 1998
 .Os
diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c
index e5fdad63e45e..31f923b3b2db 100644
--- a/lib/libc/i386/sys/i386_vm86.c
+++ b/lib/libc/i386/sys/i386_vm86.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S
index 637b86f9f0b1..1684611f766f 100644
--- a/lib/libc/i386/sys/pipe.S
+++ b/lib/libc/i386/sys/pipe.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S
index 018a02cf94ed..7f5e149d33e7 100644
--- a/lib/libc/i386/sys/ptrace.S
+++ b/lib/libc/i386/sys/ptrace.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/reboot.S b/lib/libc/i386/sys/reboot.S
index 70049b249b1d..4e39068fdff4 100644
--- a/lib/libc/i386/sys/reboot.S
+++ b/lib/libc/i386/sys/reboot.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/rfork.S b/lib/libc/i386/sys/rfork.S
index 189d399503e6..b3e20e4eeb63 100644
--- a/lib/libc/i386/sys/rfork.S
+++ b/lib/libc/i386/sys/rfork.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S
index a3afd8907900..f7aae351b00b 100644
--- a/lib/libc/i386/sys/sbrk.S
+++ b/lib/libc/i386/sys/sbrk.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/setlogin.S b/lib/libc/i386/sys/setlogin.S
index 7bcf3bd886b3..a4d74b0d10cf 100644
--- a/lib/libc/i386/sys/setlogin.S
+++ b/lib/libc/i386/sys/setlogin.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sigpending.S b/lib/libc/i386/sys/sigpending.S
index 2ce0df8b0ab1..f734fd45644a 100644
--- a/lib/libc/i386/sys/sigpending.S
+++ b/lib/libc/i386/sys/sigpending.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sigprocmask.S b/lib/libc/i386/sys/sigprocmask.S
index 6dbc8c981c68..422ae3b411d3 100644
--- a/lib/libc/i386/sys/sigprocmask.S
+++ b/lib/libc/i386/sys/sigprocmask.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S
index 65deb40ab667..7405c340030e 100644
--- a/lib/libc/i386/sys/sigreturn.S
+++ b/lib/libc/i386/sys/sigreturn.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/sigsuspend.S b/lib/libc/i386/sys/sigsuspend.S
index f85b2e1929f1..c60b9766f189 100644
--- a/lib/libc/i386/sys/sigsuspend.S
+++ b/lib/libc/i386/sys/sigsuspend.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sigsuspend.S,v 1.6 1997/02/22 14:59:40 peter Exp $
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: sigsuspend.S,v 1.6 1997/02/22 14:59:40 peter Exp $"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S
index 711a770455b2..b5516f0f8fe6 100644
--- a/lib/libc/i386/sys/syscall.S
+++ b/lib/libc/i386/sys/syscall.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(SYSLIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id$"
+	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
 #include "SYS.h"
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index b8248824a9b6..1e20bc7fcb74 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: libc_private.h,v 1.1 1998/04/11 06:57:33 jb Exp $
+ * $FreeBSD$
  *
  * Private definitions for libc, libc_r and libpthread.
  *
diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h
index e3136846afab..d81615d01bf1 100644
--- a/lib/libc/include/spinlock.h
+++ b/lib/libc/include/spinlock.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: spinlock.h,v 1.2 1998/05/05 21:46:30 jb Exp $
+ * $FreeBSD$
  *
  * Lock definitions used in both libc and libpthread.
  *
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 355e8d0b37cb..fb3cb3928a6a 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
-#	$Id: Makefile.inc,v 1.14 1999/02/23 15:13:50 ache Exp $
+# $FreeBSD$
 
 # locale sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
index 87b4058c66e3..f71870c9a34f 100644
--- a/lib/libc/locale/collate.c
+++ b/lib/libc/locale/collate.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: collate.c,v 1.15 1997/02/22 14:59:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <rune.h>
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
index 638b4beafd9b..23a87b7e0a75 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef COLLATE_H_INCLUDED
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
index 520f800ca863..ae783d06faee 100644
--- a/lib/libc/locale/collcmp.c
+++ b/lib/libc/locale/collcmp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: collcmp.c,v 1.10 1997/02/22 14:59:54 peter Exp $
+ * $FreeBSD$
  */
 
 #define ASCII_COMPATIBLE_COLLATE        /* see usr.bin/colldef/data */
diff --git a/lib/libc/locale/ctype.3 b/lib/libc/locale/ctype.3
index 137026f44316..95f234e2493e 100644
--- a/lib/libc/locale/ctype.3
+++ b/lib/libc/locale/ctype.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctype.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CTYPE 3
diff --git a/lib/libc/locale/euc.4 b/lib/libc/locale/euc.4
index 7c31516a2d9d..ce319ba37ff4 100644
--- a/lib/libc/locale/euc.4
+++ b/lib/libc/locale/euc.4
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)euc.4	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt EUC 4
diff --git a/lib/libc/locale/euc.5 b/lib/libc/locale/euc.5
index 7c31516a2d9d..ce319ba37ff4 100644
--- a/lib/libc/locale/euc.5
+++ b/lib/libc/locale/euc.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)euc.4	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt EUC 4
diff --git a/lib/libc/locale/isalnum.3 b/lib/libc/locale/isalnum.3
index b9de9af92e34..be99644b7dd9 100644
--- a/lib/libc/locale/isalnum.3
+++ b/lib/libc/locale/isalnum.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalnum.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISALNUM 3
diff --git a/lib/libc/locale/isalpha.3 b/lib/libc/locale/isalpha.3
index ce8e3f6aa7fa..7d9ba6691af4 100644
--- a/lib/libc/locale/isalpha.3
+++ b/lib/libc/locale/isalpha.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalpha.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISALPHA 3
diff --git a/lib/libc/locale/isascii.3 b/lib/libc/locale/isascii.3
index 30af961bf828..2315d7ef4deb 100644
--- a/lib/libc/locale/isascii.3
+++ b/lib/libc/locale/isascii.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isascii.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt ISASCII 3
diff --git a/lib/libc/locale/isblank.3 b/lib/libc/locale/isblank.3
index d0932c4b284d..c0ec34d0dbd2 100644
--- a/lib/libc/locale/isblank.3
+++ b/lib/libc/locale/isblank.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isblank.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISBLANK 3
diff --git a/lib/libc/locale/iscntrl.3 b/lib/libc/locale/iscntrl.3
index 444874a4d707..2b5c737e4759 100644
--- a/lib/libc/locale/iscntrl.3
+++ b/lib/libc/locale/iscntrl.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)iscntrl.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISCNTRL 3
diff --git a/lib/libc/locale/isdigit.3 b/lib/libc/locale/isdigit.3
index f5e11777fae5..dbae1778af40 100644
--- a/lib/libc/locale/isdigit.3
+++ b/lib/libc/locale/isdigit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isdigit.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISDIGIT 3
diff --git a/lib/libc/locale/isgraph.3 b/lib/libc/locale/isgraph.3
index 44fa87cd8a34..62fe710753c7 100644
--- a/lib/libc/locale/isgraph.3
+++ b/lib/libc/locale/isgraph.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isgraph.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt ISGRAPH 3
diff --git a/lib/libc/locale/islower.3 b/lib/libc/locale/islower.3
index fa92068018fa..019e612d8383 100644
--- a/lib/libc/locale/islower.3
+++ b/lib/libc/locale/islower.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)islower.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISLOWER 3
diff --git a/lib/libc/locale/isprint.3 b/lib/libc/locale/isprint.3
index fd680a8b3d2e..790015fb4650 100644
--- a/lib/libc/locale/isprint.3
+++ b/lib/libc/locale/isprint.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isprint.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISPRINT 3
diff --git a/lib/libc/locale/ispunct.3 b/lib/libc/locale/ispunct.3
index 6e4574fcb047..01a75dd818cc 100644
--- a/lib/libc/locale/ispunct.3
+++ b/lib/libc/locale/ispunct.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ispunct.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISPUNCT 3
diff --git a/lib/libc/locale/isspace.3 b/lib/libc/locale/isspace.3
index 760df448d621..c3850a2a84c0 100644
--- a/lib/libc/locale/isspace.3
+++ b/lib/libc/locale/isspace.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isspace.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISSPACE 3
diff --git a/lib/libc/locale/isupper.3 b/lib/libc/locale/isupper.3
index e8fc57e7b822..7d09f4423032 100644
--- a/lib/libc/locale/isupper.3
+++ b/lib/libc/locale/isupper.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isupper.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISUPPER 3
diff --git a/lib/libc/locale/isxdigit.3 b/lib/libc/locale/isxdigit.3
index b4bbfae4ac8d..31f315830d4d 100644
--- a/lib/libc/locale/isxdigit.3
+++ b/lib/libc/locale/isxdigit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isxdigit.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISXDIGIT 3
diff --git a/lib/libc/locale/mbrune.3 b/lib/libc/locale/mbrune.3
index 610e89f46a9e..5c9d53b2e3be 100644
--- a/lib/libc/locale/mbrune.3
+++ b/lib/libc/locale/mbrune.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mbrune.3	8.2 (Berkeley) 4/19/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt MBRUNE 3
diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3
index 2a819bb77e8b..fd0c19f4b059 100644
--- a/lib/libc/locale/multibyte.3
+++ b/lib/libc/locale/multibyte.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MULTIBYTE 3
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index cfef20fe406b..997c26c51bbf 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rune.3	8.2 (Berkeley) 12/11/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt RUNE 3
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
index e7aebf4d95d8..475003416288 100644
--- a/lib/libc/locale/setlocale.3
+++ b/lib/libc/locale/setlocale.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)setlocale.3	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt SETLOCALE 3
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index ac8729dcbb33..44d0dfee7ffa 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setlocale.c,v 1.22 1998/01/15 09:58:07 jb Exp $
+ * $FreeBSD$
  */
 
 #ifdef LIBC_RCS
 static const char rcsid[] =
-	"$Id: setlocale.c,v 1.22 1998/01/15 09:58:07 jb Exp $";
+  "$FreeBSD$";
 #endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
index 00f80d7f7dc0..556a8defbda0 100644
--- a/lib/libc/locale/table.c
+++ b/lib/libc/locale/table.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: table.c,v 1.10 1997/05/13 11:19:26 ache Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/locale/toascii.3 b/lib/libc/locale/toascii.3
index 8cc333b92c27..6fc26f97ad88 100644
--- a/lib/libc/locale/toascii.3
+++ b/lib/libc/locale/toascii.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)toascii.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TOASCII 3
diff --git a/lib/libc/locale/tolower.3 b/lib/libc/locale/tolower.3
index c9830462d3de..1bd82c294942 100644
--- a/lib/libc/locale/tolower.3
+++ b/lib/libc/locale/tolower.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tolower.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TOLOWER 3
diff --git a/lib/libc/locale/toupper.3 b/lib/libc/locale/toupper.3
index 197517584734..33742da48de3 100644
--- a/lib/libc/locale/toupper.3
+++ b/lib/libc/locale/toupper.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)toupper.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TOUPPER 3
diff --git a/lib/libc/locale/utf2.4 b/lib/libc/locale/utf2.4
index 94526d83b0a7..3734dbab1669 100644
--- a/lib/libc/locale/utf2.4
+++ b/lib/libc/locale/utf2.4
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)utf2.4	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt UTF2 4
diff --git a/lib/libc/locale/utf2.5 b/lib/libc/locale/utf2.5
index 94526d83b0a7..3734dbab1669 100644
--- a/lib/libc/locale/utf2.5
+++ b/lib/libc/locale/utf2.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)utf2.4	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt UTF2 4
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index f21c58ece51c..8b4db7cd4a88 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
-#	$Id: Makefile.inc,v 1.27 1998/06/11 09:02:30 peter Exp $
+# $FreeBSD$
 
 # machine-independent net sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net
diff --git a/lib/libc/net/addr2ascii.3 b/lib/libc/net/addr2ascii.3
index 3b28eff604f8..b5ec16799f8e 100644
--- a/lib/libc/net/addr2ascii.3
+++ b/lib/libc/net/addr2ascii.3
@@ -27,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 13, 1996
 .Dt ADDR2ASCII 3
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
index 3f2ed6c71420..1a4909f8bb9c 100644
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -41,7 +41,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static char rcsid[] = "$Id: base64.c,v 8.5 1998/03/27 00:17:46 halley Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/byteorder.3 b/lib/libc/net/byteorder.3
index 81bf6048677c..3c55d21c18a6 100644
--- a/lib/libc/net/byteorder.3
+++ b/lib/libc/net/byteorder.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt BYTEORDER 3
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
index 9b7a9abf44a8..89aa7b5d6924 100644
--- a/lib/libc/net/ether_addr.c
+++ b/lib/libc/net/ether_addr.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index d0d68115a022..41376c91f65e 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: ethers.3,v 1.7 1997/02/22 15:00:05 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 3
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index b27d234bbb06..32271db6bbd0 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -56,7 +56,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 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 $";
-static char rcsid[] = "$Id: gethostbydns.c,v 1.22 1997/06/27 08:22:01 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index 0e24042b98cf..cd5f0f45735b 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -53,7 +53,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id: gethostbyht.c,v 1.10 1997/06/27 08:22:01 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index 4c369fec6e06..ba5b428904f7 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\"     $Id: gethostbyname.3,v 1.9 1998/03/23 13:05:07 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 25, 1995
 .Dt GETHOSTBYNAME 3
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
index 517cb9c86d95..82e0b3d01cb0 100644
--- a/lib/libc/net/gethostbynis.c
+++ b/lib/libc/net/gethostbynis.c
@@ -24,8 +24,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id: gethostbynis.c,v 1.8 1997/02/22 15:00:08 peter Exp $";
-static char rcsid[] = "$Id: gethostbynis.c,v 1.8 1997/02/22 15:00:08 peter Exp $";
+static char sccsid[] = "@(#)$FreeBSD$";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index 9415a5314672..8e02d2c103dd 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -24,8 +24,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id: gethostnamadr.c,v 1.12 1997/02/22 15:00:09 peter Exp $";
-static char rcsid[] = "$Id: gethostnamadr.c,v 1.12 1997/02/22 15:00:09 peter Exp $";
+static char sccsid[] = "@(#)$FreeBSD$";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
index bacdb676c3f2..65d9d2de96d8 100644
--- a/lib/libc/net/getnetbydns.c
+++ b/lib/libc/net/getnetbydns.c
@@ -60,7 +60,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id: getnetbydns.c,v 1.11 1997/06/27 08:22:01 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
index f7b7b1091dad..ab164b16746d 100644
--- a/lib/libc/net/getnetbyht.c
+++ b/lib/libc/net/getnetbyht.c
@@ -44,7 +44,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 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";
-static chat rcsid[] = "$Id$";
+static chat rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
index 0549016ba210..0ab7073cada5 100644
--- a/lib/libc/net/getnetbynis.c
+++ b/lib/libc/net/getnetbynis.c
@@ -24,8 +24,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)$Id$";
-static char rcsid[] = "$Id$";
+static char sccsid[] = "@(#)$FreeBSD$";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/getnetent.3 b/lib/libc/net/getnetent.3
index aec93b58760b..58bb7a29fa09 100644
--- a/lib/libc/net/getnetent.3
+++ b/lib/libc/net/getnetent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETNETENT 3
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index c964cffd1801..3ac10c2cbaa5 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -24,7 +24,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: getnetnamadr.c,v 1.9 1997/02/22 15:00:12 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/getprotoent.3 b/lib/libc/net/getprotoent.3
index 784461d7e32f..fad937e9607c 100644
--- a/lib/libc/net/getprotoent.3
+++ b/lib/libc/net/getprotoent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETPROTOENT 3
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index 961e46be03d8..eac236161836 100644
--- a/lib/libc/net/getservent.3
+++ b/lib/libc/net/getservent.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\"	$Id: getservent.3,v 1.5 1997/02/22 15:00:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 9, 1995
 .Dt GETSERVENT 3
diff --git a/lib/libc/net/herror.c b/lib/libc/net/herror.c
index ac3ca3bd9cb2..0ab744843251 100644
--- a/lib/libc/net/herror.c
+++ b/lib/libc/net/herror.c
@@ -50,7 +50,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id: herror.c,v 1.6 1997/02/22 15:00:14 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3
index 6ad1bc6a91d1..629ab0f18894 100644
--- a/lib/libc/net/inet.3
+++ b/lib/libc/net/inet.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\"	$Id: inet.3,v 1.5 1997/02/22 15:00:15 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 17, 1996
 .Dt INET 3
diff --git a/lib/libc/net/inet_addr.c b/lib/libc/net/inet_addr.c
index 7b027daed3a2..3fac1cafa31d 100644
--- a/lib/libc/net/inet_addr.c
+++ b/lib/libc/net/inet_addr.c
@@ -55,7 +55,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id: inet_addr.c,v 1.5 1997/02/22 15:00:16 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/inet_net_ntop.c b/lib/libc/net/inet_net_ntop.c
index d273d4d6195d..4b30cb69e859 100644
--- a/lib/libc/net/inet_net_ntop.c
+++ b/lib/libc/net/inet_net_ntop.c
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char orig_rcsid[] = "From Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.3 1997/02/22 15:00:16 peter Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/inet_net_pton.c b/lib/libc/net/inet_net_pton.c
index be2d69d32721..04a45d43a641 100644
--- a/lib/libc/net/inet_net_pton.c
+++ b/lib/libc/net/inet_net_pton.c
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $";
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.4 1998/06/11 09:02:33 peter Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/inet_neta.c b/lib/libc/net/inet_neta.c
index 21b2749a9798..2b8a84c42171 100644
--- a/lib/libc/net/inet_neta.c
+++ b/lib/libc/net/inet_neta.c
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char orig_rcsid[] = "From Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-static const char rcsid[] = "$Id: inet_neta.c,v 1.4 1998/02/20 08:13:51 jb Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c
index 9e011c393034..0b9449b0d81f 100644
--- a/lib/libc/net/inet_ntop.c
+++ b/lib/libc/net/inet_ntop.c
@@ -15,7 +15,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_ntop.c,v 1.4 1998/06/11 09:02:35 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c
index 6c8afd93e04e..488ac7fe400f 100644
--- a/lib/libc/net/inet_pton.c
+++ b/lib/libc/net/inet_pton.c
@@ -15,7 +15,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: inet_pton.c,v 1.4 1998/06/11 09:02:35 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/net/iso_addr.3 b/lib/libc/net/iso_addr.3
index 0c9973bef466..ad4977800bdb 100644
--- a/lib/libc/net/iso_addr.3
+++ b/lib/libc/net/iso_addr.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)iso_addr.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ISO_ADDR 3
diff --git a/lib/libc/net/linkaddr.3 b/lib/libc/net/linkaddr.3
index 6999add0e862..543e04019b15 100644
--- a/lib/libc/net/linkaddr.3
+++ b/lib/libc/net/linkaddr.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 17, 1996
 .Dt LINK_ADDR 3
diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c
index 0f8658e1174b..ca5e55388f6e 100644
--- a/lib/libc/net/map_v4v6.c
+++ b/lib/libc/net/map_v4v6.c
@@ -55,7 +55,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/ns.3 b/lib/libc/net/ns.3
index e621ad2d9066..6e697f9d4254 100644
--- a/lib/libc/net/ns.3
+++ b/lib/libc/net/ns.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ns.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt NS 3
diff --git a/lib/libc/net/ns_name.c b/lib/libc/net/ns_name.c
index bd4de80950df..cbaf7bd1b19f 100644
--- a/lib/libc/net/ns_name.c
+++ b/lib/libc/net/ns_name.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ns_name.c,v 8.3 1997/04/24 22:10:54 vixie Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/ns_netint.c b/lib/libc/net/ns_netint.c
index 0dc8fe4699d1..5e25b497011c 100644
--- a/lib/libc/net/ns_netint.c
+++ b/lib/libc/net/ns_netint.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ns_netint.c,v 8.1 1996/11/18 09:09:57 vixie Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* Import. */
diff --git a/lib/libc/net/ns_parse.c b/lib/libc/net/ns_parse.c
index 1fb9205d5818..d3653b1072c3 100644
--- a/lib/libc/net/ns_parse.c
+++ b/lib/libc/net/ns_parse.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ns_parse.c,v 1.1 1998/06/11 09:02:40 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/net/ns_print.c b/lib/libc/net/ns_print.c
index 60b9017c3a76..6be8c804792f 100644
--- a/lib/libc/net/ns_print.c
+++ b/lib/libc/net/ns_print.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ns_print.c,v 8.4 1998/02/13 01:16:37 halley Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* Import. */
diff --git a/lib/libc/net/ns_ttl.c b/lib/libc/net/ns_ttl.c
index e62ae9940447..3327d8691f3c 100644
--- a/lib/libc/net/ns_ttl.c
+++ b/lib/libc/net/ns_ttl.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ns_ttl.c,v 8.5 1998/02/13 01:16:38 halley Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* Import. */
diff --git a/lib/libc/net/nsap_addr.c b/lib/libc/net/nsap_addr.c
index 714c2c90222e..1f16fd26e999 100644
--- a/lib/libc/net/nsap_addr.c
+++ b/lib/libc/net/nsap_addr.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: nsap_addr.c,v 1.5 1998/06/11 09:02:45 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index e25057fa4eb9..0154e828e5d5 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd February 15, 1996
 .Dt RCMD 3
diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c
index a85e36d835ee..0d237ac87f76 100644
--- a/lib/libc/net/res_comp.c
+++ b/lib/libc/net/res_comp.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $";
-static char rcsid[] = "$Id: res_comp.c,v 1.14 1998/06/11 09:02:46 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_data.c b/lib/libc/net/res_data.c
index b79e3abdce43..501ca32f3e48 100644
--- a/lib/libc/net/res_data.c
+++ b/lib/libc/net/res_data.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: res_data.c,v 1.5 1997/02/22 15:00:30 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_debug.c b/lib/libc/net/res_debug.c
index 2d1d7e0dd19e..900d6a23fa7c 100644
--- a/lib/libc/net/res_debug.c
+++ b/lib/libc/net/res_debug.c
@@ -95,7 +95,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id: res_debug.c,v 1.15 1998/06/11 09:02:53 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c
index 8c77151602d2..8f6e649703cf 100644
--- a/lib/libc/net/res_init.c
+++ b/lib/libc/net/res_init.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $";
-static char rcsid[] = "$Id: res_init.c,v 1.16 1998/09/02 00:53:17 jdp Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c
index a06fc5417707..5ac662bd1432 100644
--- a/lib/libc/net/res_mkquery.c
+++ b/lib/libc/net/res_mkquery.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $";
-static char rcsid[] = "$Id: res_mkquery.c,v 1.13 1998/06/11 09:02:55 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_mkupdate.c b/lib/libc/net/res_mkupdate.c
index a9dcc8606fd4..eb31bac4dd78 100644
--- a/lib/libc/net/res_mkupdate.c
+++ b/lib/libc/net/res_mkupdate.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id: res_mkupdate.c,v 1.11 1998/01/26 23:08:45 halley Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c
index d7d7b28e8dea..c2f784ca4d91 100644
--- a/lib/libc/net/res_query.c
+++ b/lib/libc/net/res_query.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
-static char rcsid[] = "$Id: res_query.c,v 1.16 1998/06/11 09:03:00 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c
index 13e830fab445..fc394ca54185 100644
--- a/lib/libc/net/res_send.c
+++ b/lib/libc/net/res_send.c
@@ -71,7 +71,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $";
-static char rcsid[] = "$Id: res_send.c,v 1.24 1998/06/14 11:25:46 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libc/net/res_update.c b/lib/libc/net/res_update.c
index c76d22e72fe1..a877d4aa1a82 100644
--- a/lib/libc/net/res_update.c
+++ b/lib/libc/net/res_update.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static char rcsid[] = "$Id: res_update.c,v 1.14 1998/03/10 22:04:48 halley Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index 04d1a41f1d17..4e715859925d 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RESOLVER 3
diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc
index 8bbca27a2b6d..56a664da510a 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 $
-#	$Id: Makefile.inc,v 1.3 1997/05/03 03:50:01 jb Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/nls
 
diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3
index 9376565795f5..bf14e6728242 100644
--- a/lib/libc/nls/catclose.3
+++ b/lib/libc/nls/catclose.3
@@ -1,4 +1,4 @@
-.\"	$Id: catclose.3,v 1.4 1997/02/22 15:00:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1994 Winning Strategies, Inc.
 .\" All rights reserved.
diff --git a/lib/libc/nls/catclose.c b/lib/libc/nls/catclose.c
index 341f6643aa80..a7326669059d 100644
--- a/lib/libc/nls/catclose.c
+++ b/lib/libc/nls/catclose.c
@@ -1,4 +1,4 @@
-/*	$Id$ */
+/* $FreeBSD$ */
 
 /*
  * Written by J.T. Conklin, 10/05/94
diff --git a/lib/libc/nls/catgets.3 b/lib/libc/nls/catgets.3
index 6d03527edd01..ef33396f23c5 100644
--- a/lib/libc/nls/catgets.3
+++ b/lib/libc/nls/catgets.3
@@ -1,4 +1,4 @@
-.\"	$Id: catgets.3,v 1.4 1997/02/22 15:00:46 peter Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1994 Winning Strategies, Inc.
 .\" All rights reserved.
diff --git a/lib/libc/nls/catgets.c b/lib/libc/nls/catgets.c
index 6c4c55a53347..037b6ff684da 100644
--- a/lib/libc/nls/catgets.c
+++ b/lib/libc/nls/catgets.c
@@ -1,4 +1,4 @@
-/*	$Id: catgets.c,v 1.3 1997/02/22 15:00:47 peter Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Written by J.T. Conklin, 10/05/94
diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3
index e1c8fe34bc4a..2d9d5a7e3e0c 100644
--- a/lib/libc/nls/catopen.3
+++ b/lib/libc/nls/catopen.3
@@ -1,4 +1,4 @@
-.\"	$Id: catopen.3,v 1.5 1998/04/30 11:06:12 ache Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1994 Winning Strategies, Inc.
 .\" All rights reserved.
diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c
index 5dfb727c5812..c5ab394c8081 100644
--- a/lib/libc/nls/catopen.c
+++ b/lib/libc/nls/catopen.c
@@ -1,4 +1,4 @@
-/*	$Id$ */
+/* $FreeBSD$ */
 
 /*
  * Written by J.T. Conklin, 10/05/94
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index ff0ddd6c4e78..0e11ee259ef6 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -1,4 +1,4 @@
-/*	$Id: msgcat.c,v 1.17 1998/04/30 13:15:31 ache Exp $ */
+/* $FreeBSD$ */
 
 /***********************************************************
 Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
diff --git a/lib/libc/nls/msgcat.h b/lib/libc/nls/msgcat.h
index 9df7a82907b9..0a4c1643c940 100644
--- a/lib/libc/nls/msgcat.h
+++ b/lib/libc/nls/msgcat.h
@@ -1,4 +1,4 @@
-/*	$Id$ */
+/* $FreeBSD$ */
 
 /* -*-c++-*- */
 
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index 670d84ae4c37..9934328b6ecb 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
-#	$Id: Makefile.inc,v 1.6 1997/12/19 21:56:38 bde Exp $
+# $FreeBSD$
 
 # Quad support, if needed
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/quad ${.CURDIR}/../libc/quad
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index 873a1f6bde0a..65f0f127e48e 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc
index 12af2a83e758..107de2e9c4ef 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
-#	$Id: Makefile.inc,v 1.3 1997/05/03 03:50:02 jb Exp $
+# $FreeBSD$
 
 # regex sources
 .PATH: ${.CURDIR}/../libc/regex
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index 23526c803a41..1fcce4a4ff21 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH RE_FORMAT 7 "March 20, 1994"
 .SH NAME
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 9c1391310050..3d90055c142f 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH REGEX 3 "March 20, 1994"
 .de ZR
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index 94cd6b3ab31e..bfaeaa7c0364 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
-#	$Id: Makefile.inc,v 1.12 1997/10/21 08:41:09 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/.
 
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index 3fd2bfe8f4a0..51cfb1f62bb3 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -48,7 +48,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = 	"@(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI"; */
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 extern bool_t __rpc_get_time_offset __P(( struct timeval *, nis_server *,
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index b2e2995ac8fd..9649df3ab51b 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: auth_none.c,v 1.5 1996/12/30 14:13:30 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 32200c2cb35a..f2a09183f061 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: auth_unix.c,v 1.7 1996/12/30 14:14:39 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index c818ba0de77c..54f23fc9fefd 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: authunix_prot.c,v 1.2 1995/05/30 05:41:12 rgrimes Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/bindresvport.3 b/lib/libc/rpc/bindresvport.3
index cf67de902723..9abdcb991619 100644
--- a/lib/libc/rpc/bindresvport.3
+++ b/lib/libc/rpc/bindresvport.3
@@ -1,5 +1,5 @@
 .\" @(#)bindresvport.3n	2.2 88/08/02 4.0 RPCSRC; from 1.7 88/03/14 SMI
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd November 22, 1987
 .Dt BINDRESVPORT 3
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index dea87057c019..1a62efaca877 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -31,7 +31,7 @@
 /*static char *sccsid = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";*/
 /*static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";*/
 /*from: OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp */
-static char *rcsid = "$Id: bindresvport.c,v 1.6 1996/12/30 14:12:36 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index ed754ea6a697..5e3cb7bb922b 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "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";*/
-static char *rcsid = "$Id: clnt_generic.c,v 1.5 1996/12/30 14:17:20 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index d48bfa5d10a9..53c2c88d8176 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_perror.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_perror.c,v 1.9 1997/05/28 05:05:04 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index c715ef698efa..6f228fe99d69 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_raw.c,v 1.6 1996/12/30 14:21:36 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index 5bcfd47df3ed..dd935d36ece9 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_simple.c,v 1.6 1996/12/30 14:23:50 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_tcp.c b/lib/libc/rpc/clnt_tcp.c
index cb9b4dc98057..ebbaddc7c44c 100644
--- a/lib/libc/rpc/clnt_tcp.c
+++ b/lib/libc/rpc/clnt_tcp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_tcp.c,v 1.10 1997/05/28 05:05:08 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c
index 35328491c3c9..5756fc56100b 100644
--- a/lib/libc/rpc/clnt_udp.c
+++ b/lib/libc/rpc/clnt_udp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_udp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_udp.c,v 1.8 1996/12/30 14:40:34 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/clnt_unix.c b/lib/libc/rpc/clnt_unix.c
index e4c43094bc9c..d7a490bc61df 100644
--- a/lib/libc/rpc/clnt_unix.c
+++ b/lib/libc/rpc/clnt_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)clnt_unix.c 1.37 87/10/05 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)clnt_unix.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: clnt_unix.c,v 1.7 1996/12/30 14:36:17 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/crypt_client.c b/lib/libc/rpc/crypt_client.c
index abe0319bf31e..ab01971657e7 100644
--- a/lib/libc/rpc/crypt_client.c
+++ b/lib/libc/rpc/crypt_client.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: crypt_client.c,v 1.2 1997/05/28 05:05:10 wpaul Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
@@ -39,7 +39,7 @@
 #include <rpcsvc/crypt.h>
 
 #ifndef lint
-static const char rcsid[] = "$Id: crypt_client.c,v 1.2 1997/05/28 05:05:10 wpaul Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 #ifndef KEYSERVSOCK
diff --git a/lib/libc/rpc/des_crypt.3 b/lib/libc/rpc/des_crypt.3
index 371db650844f..00ddda91367f 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;
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .TH DES_CRYPT 3  "6 October 1987"
 .SH NAME
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index 18c99724d3ea..fa71d5c355ee 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI"; */
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 static int common_crypt	__P(( char *, char *, register unsigned, unsigned, struct desparams * ));
diff --git a/lib/libc/rpc/get_myaddress.c b/lib/libc/rpc/get_myaddress.c
index f4ba48bfe413..a18a032ecec4 100644
--- a/lib/libc/rpc/get_myaddress.c
+++ b/lib/libc/rpc/get_myaddress.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)get_myaddress.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: get_myaddress.c,v 1.13 1997/09/21 23:04:51 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/getrpcent.3 b/lib/libc/rpc/getrpcent.3
index ce428d7a60b0..eef8067456b1 100644
--- a/lib/libc/rpc/getrpcent.3
+++ b/lib/libc/rpc/getrpcent.3
@@ -1,5 +1,5 @@
 .\" @(#)getrpcent.3n	2.2 88/08/02 4.0 RPCSRC; from 1.11 88/03/14 SMI
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 14, 1987
 .Dt GETRPCENT 3
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index 826628529e5c..4290235e686d 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -30,7 +30,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";*/
-static char *rcsid = "$Id: getrpcent.c,v 1.6 1996/12/30 14:42:31 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/getrpcport.3 b/lib/libc/rpc/getrpcport.3
index 0f9ad6ba0aa4..b4fa8124d43e 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
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd October 6, 1987
 .Dt GETRPCPORT 3
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 04a8de224ae9..24c6257fd886 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)getrpcport.c 1.3 87/08/11 SMI";*/
 /*static char *sccsid = "from: @(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: getrpcport.c,v 1.6 1996/12/30 14:43:42 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index 9901d8155f78..67d1d89a7675 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_clnt.c,v 1.5 1996/12/30 14:46:33 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index d4f27742a52d..098ba17bffac 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_getmaps.c,v 1.5 1996/12/30 14:48:28 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index 3d4c48a5544e..29a26ca4b71e 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_getport.c,v 1.4 1996/12/30 14:49:24 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index fcb9c9997157..f42484299477 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_prot.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_prot.c,v 1.2 1995/05/30 05:41:25 rgrimes Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index d81f6129802d..9c5230ddaeba 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_prot2.c,v 1.3 1996/06/10 20:13:05 jraynard Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index 07a81e2b7fc5..355f34b83e76 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: pmap_rmt.c,v 1.9 1996/12/30 14:53:20 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/publickey.3 b/lib/libc/rpc/publickey.3
index abe74c6718b0..7f32e4994b76 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
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .TH PUBLICKEY 3R  "6 October 1987"
 .SH NAME
diff --git a/lib/libc/rpc/publickey.5 b/lib/libc/rpc/publickey.5
index 50c8648e35ab..806028fba3d4 100644
--- a/lib/libc/rpc/publickey.5
+++ b/lib/libc/rpc/publickey.5
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 .\" @(#)publickey.5	2.1 88/08/07 4.0 RPCSRC; from 1.6 88/02/29 SMI;
 .TH PUBLICKEY 5 "19 October 1987"
 .SH NAME
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index 82e643f6623c..256b59ba4a2b 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,5 +1,5 @@
 .\" @(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .TH RPC 3 "16 February 1988"
 .SH NAME
diff --git a/lib/libc/rpc/rpc.5 b/lib/libc/rpc/rpc.5
index 421dc9bb2e52..b559020bf420 100644
--- a/lib/libc/rpc/rpc.5
+++ b/lib/libc/rpc/rpc.5
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 .\" @(#)rpc.5	2.2 88/08/03 4.0 RPCSRC; from 1.4 87/11/27 SMI;
 .Dd September 26, 1985
 .Dt RPC 5
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index af8e57309334..dca3a1880d93 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: rpc_callmsg.c,v 1.5 1996/12/30 14:55:38 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
index 96407821794b..043c08285056 100644
--- a/lib/libc/rpc/rpc_commondata.c
+++ b/lib/libc/rpc/rpc_commondata.c
@@ -29,7 +29,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: rpc_commondata.c,v 1.3 1996/12/30 14:57:33 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 #include <rpc/rpc.h>
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index c2703fa3e6d4..1ce5617655d6 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";*/
 /*static char *sccsid = "from: @(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: rpc_dtablesize.c,v 1.6 1996/12/30 18:41:20 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 #include <sys/types.h>
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index 8debaf14ad6d..940a29d13704 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC";*/
-static char *rcsid = "$Id: rpc_prot.c,v 1.4 1996/12/30 15:00:53 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index ac298d1dde16..23f1a7efd0d2 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
-.\" $Id: rpc_secure.3,v 1.3 1998/01/16 13:33:09 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 16, 1988
 .Dt RPC 3
diff --git a/lib/libc/rpc/rstat.1 b/lib/libc/rpc/rstat.1
index fc9c5fecf81a..b302282b0d32 100644
--- a/lib/libc/rpc/rstat.1
+++ b/lib/libc/rpc/rstat.1
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 .\" @(#)rstat.1	2.1 88/08/03 4.0 RPCSRC
 .TH RSTAT 1 "3 August 1988"
 .SH NAME
diff --git a/lib/libc/rpc/rstat_svc.8 b/lib/libc/rpc/rstat_svc.8
index 948fc7d00e41..103cbf5eb30f 100644
--- a/lib/libc/rpc/rstat_svc.8
+++ b/lib/libc/rpc/rstat_svc.8
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 .\" @(#)rstat_svc.8c	2.2 88/08/03 4.0 RPCSRC; from 1.10 87/09/09 SMI
 .TH RSTAT_SVC 8 "24 November 1987"
 .SH NAME
diff --git a/lib/libc/rpc/rtime.3 b/lib/libc/rpc/rtime.3
index eb2cdb1fa0ff..de1986649267 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
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .TH RTIME 3  "22 November 1987"
 .SH NAME
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index fb2b4021f5f1..4e65c037563d 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -54,7 +54,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = 	"@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI"; */
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 extern int _rpc_dtablesize __P(( void ));
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index ba0b53f78927..1f9803bb6640 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc.c	2.4 88/08/11 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc.c,v 1.12 1997/05/28 05:05:23 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index 889182e6992f..6a937f503913 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -62,7 +62,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = 	"@(#)svcauth_des.c	2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI"; */
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 #define debug(msg)	 printf("svcauth_des: %s\n", msg) 
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index 959cb7363887..4e800e5e2aa3 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_auth_unix.c,v 1.4 1996/12/30 15:10:14 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index 3a5bcb3cf47c..472615253428 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_raw.c 1.15 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_raw.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_raw.c,v 1.3 1995/10/22 14:51:36 phk Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index 0692c25840ba..f39886a4e3d7 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "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";*/
-static char *rcsid = "$Id: svc_run.c,v 1.7 1997/02/22 15:01:32 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index 032467568ec5..1bfaf1c8cd45 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_simple.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_simple.c,v 1.5 1996/12/30 15:16:22 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c
index 75c242633d4e..a87b361e87a5 100644
--- a/lib/libc/rpc/svc_tcp.c
+++ b/lib/libc/rpc/svc_tcp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_tcp.c,v 1.12 1998/05/15 22:53:45 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c
index 6622de2871cd..4b76f2d1aadf 100644
--- a/lib/libc/rpc/svc_udp.c
+++ b/lib/libc/rpc/svc_udp.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_udp.c	2.2 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_udp.c,v 1.7 1996/12/30 15:21:19 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/rpc/svc_unix.c b/lib/libc/rpc/svc_unix.c
index c44cc641ec02..365f1a5bbd77 100644
--- a/lib/libc/rpc/svc_unix.c
+++ b/lib/libc/rpc/svc_unix.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc_unix.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc_unix.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc_unix.c,v 1.3 1998/05/15 22:53:47 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index 43deef474561..514ab31c15bc 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
-#	$Id: Makefile.inc,v 1.17 1999/03/05 13:01:22 bde Exp $
+# $FreeBSD$
 
 # stdio sources
 .PATH: ${.CURDIR}/../libc/stdio
diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c
index 96f5c9452e3f..ada714c05db4 100644
--- a/lib/libc/stdio/_flock_stub.c
+++ b/lib/libc/stdio/_flock_stub.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: _flock_stub.c,v 1.1 1998/04/11 07:40:41 jb Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index 43e90a92c11b..e125bfc4bedf 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static char rcsid[] = "$Id: asprintf.c,v 1.4 1998/07/08 00:44:51 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
index 7710be80d7d5..4e6b72027287 100644
--- a/lib/libc/stdio/clrerr.c
+++ b/lib/libc/stdio/clrerr.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: clrerr.c,v 1.5 1997/02/22 15:01:46 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fclose.3 b/lib/libc/stdio/fclose.3
index 66af831dd809..9850c8bf2a16 100644
--- a/lib/libc/stdio/fclose.3
+++ b/lib/libc/stdio/fclose.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fclose.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FCLOSE 3
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
index 5919ce079c69..302a7bac3dc2 100644
--- a/lib/libc/stdio/fclose.c
+++ b/lib/libc/stdio/fclose.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fclose.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fclose.c,v 1.5 1997/02/22 15:01:47 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
index e42df61ea669..3581100a3806 100644
--- a/lib/libc/stdio/feof.c
+++ b/lib/libc/stdio/feof.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/ferror.3 b/lib/libc/stdio/ferror.3
index bb3d895319a9..c6850c95d9d1 100644
--- a/lib/libc/stdio/ferror.3
+++ b/lib/libc/stdio/ferror.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ferror.3	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt FERROR 3
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
index 8a6850095bf2..2311926b1bd2 100644
--- a/lib/libc/stdio/ferror.c
+++ b/lib/libc/stdio/ferror.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fflush.3 b/lib/libc/stdio/fflush.3
index 60c68c874a52..0b0ed431fcd9 100644
--- a/lib/libc/stdio/fflush.3
+++ b/lib/libc/stdio/fflush.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fflush.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FFLUSH 3
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index f5c89e776de6..cd7fbe8a49ee 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fflush.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fflush.c,v 1.5 1997/02/22 15:01:50 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
index 42ce2bb1daf1..4e527053c52e 100644
--- a/lib/libc/stdio/fgetc.c
+++ b/lib/libc/stdio/fgetc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fgetc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fgetc.c,v 1.5 1997/02/22 15:01:51 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3
index 9f33d9baa102..17c09e70c13e 100644
--- a/lib/libc/stdio/fgetln.3
+++ b/lib/libc/stdio/fgetln.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt FGETLN 3
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index 7c5742b908e1..3987b0d6f357 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fgetln.c	8.2 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
index eed7b13d0035..6d6cfa19ff25 100644
--- a/lib/libc/stdio/fgetpos.c
+++ b/lib/libc/stdio/fgetpos.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fgetpos.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fgetpos.c,v 1.6 1998/04/11 07:40:42 jb Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3
index ba60b9786a7d..9b4d4ef5251a 100644
--- a/lib/libc/stdio/fgets.3
+++ b/lib/libc/stdio/fgets.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FGETS 3
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index a1833d2ccf5c..33b7144e6ff2 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
 #endif
 static const char rcsid[] =
-		"$Id: fgets.c,v 1.7 1997/02/22 15:01:53 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index 6ceac0c1d8e0..0c3a8dc0c612 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
index 8a6cddd71a90..f0b37cf12942 100644
--- a/lib/libc/stdio/findfp.c
+++ b/lib/libc/stdio/findfp.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)findfp.c	8.2 (Berkeley) 1/4/94";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
index 4ef0db11a400..afcc4d80f8ec 100644
--- a/lib/libc/stdio/flags.c
+++ b/lib/libc/stdio/flags.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)flags.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3
index 5be334a4e78a..0b767295cb39 100644
--- a/lib/libc/stdio/fopen.3
+++ b/lib/libc/stdio/fopen.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fopen.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FOPEN 3
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
index 383f1e17908b..27094b38779c 100644
--- a/lib/libc/stdio/fprintf.c
+++ b/lib/libc/stdio/fprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
index 97d0651a01f5..acf0b8b451e1 100644
--- a/lib/libc/stdio/fpurge.c
+++ b/lib/libc/stdio/fpurge.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fpurge.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fpurge.c,v 1.5 1997/02/22 15:01:58 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index d1f5e6c079a8..60079f13c0ed 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fputc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fputc.c,v 1.5 1997/02/22 15:02:00 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fputs.3 b/lib/libc/stdio/fputs.3
index db7796511407..75ba73dd8bef 100644
--- a/lib/libc/stdio/fputs.3
+++ b/lib/libc/stdio/fputs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FPUTS 3
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index b2ef3a9164d0..63a5321f0f2f 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fputs.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fputs.c,v 1.5 1997/02/22 15:02:02 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fread.3 b/lib/libc/stdio/fread.3
index 13d1caa2a398..5fc67a2fd0ad 100644
--- a/lib/libc/stdio/fread.3
+++ b/lib/libc/stdio/fread.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fread.3	8.2 (Berkeley) 3/8/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 8, 1994
 .Dt FREAD 3
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
index 34db38ff8762..886a9fc5517c 100644
--- a/lib/libc/stdio/fread.c
+++ b/lib/libc/stdio/fread.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fread.c	8.2 (Berkeley) 12/11/93";
 #endif
 static const char rcsid[] =
-		"$Id: fread.c,v 1.5 1997/02/22 15:02:03 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index a8b10a48c70b..8b7b9411a934 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fscanf.c,v 1.5 1997/02/22 15:02:04 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fseek.3 b/lib/libc/stdio/fseek.3
index 5b1f513356c6..fd6ff9ff3d8e 100644
--- a/lib/libc/stdio/fseek.3
+++ b/lib/libc/stdio/fseek.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fseek.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd Mar 5, 1999
 .Dt FSEEK 3
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index 7d7254ad0e64..8c2732e1b924 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fseek.c	8.3 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-		"$Id: fseek.c,v 1.7 1998/04/11 07:40:44 jb Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
index 72a4bf2cd8af..60ab719d4351 100644
--- a/lib/libc/stdio/fsetpos.c
+++ b/lib/libc/stdio/fsetpos.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fsetpos.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fsetpos.c,v 1.5 1997/02/22 15:02:06 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index 552ed2124ce7..9057f89b7aef 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ftell.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-		"$Id: ftell.c,v 1.9 1998/04/11 07:40:44 jb Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index 1f8cb669da47..b3cf808a9b9e 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)funopen.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt FUNOPEN 3
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index 9cce8f2085fd..75d719132e9c 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fvwrite.c,v 1.8 1998/07/08 00:44:54 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index 8f91b46d9049..b1a25d1f8707 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fwalk.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
index d2dadd838074..681b9d313b42 100644
--- a/lib/libc/stdio/fwrite.c
+++ b/lib/libc/stdio/fwrite.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)fwrite.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: fwrite.c,v 1.5 1997/02/22 15:02:10 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
index 95201e59d1ea..b0fde0dd2b05 100644
--- a/lib/libc/stdio/getc.3
+++ b/lib/libc/stdio/getc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETC 3
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index 436a93f097f8..eff320aa432d 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: getc.c,v 1.5 1997/02/22 15:02:11 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
index ee3f809620c6..ec8810d64b07 100644
--- a/lib/libc/stdio/getchar.c
+++ b/lib/libc/stdio/getchar.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: getchar.c,v 1.5 1997/02/22 15:02:12 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index 0c821ea76bd1..da90fe29c24d 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)gets.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
index c72756d4db8d..5ebb46b4f96f 100644
--- a/lib/libc/stdio/getw.c
+++ b/lib/libc/stdio/getw.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)getw.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3
index 9af42482bfc8..30610f27636d 100644
--- a/lib/libc/stdio/mktemp.3
+++ b/lib/libc/stdio/mktemp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mktemp.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 11, 1998
 .Dt MKTEMP 3
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 0127bdba35df..ec03f7144330 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: mktemp.c,v 1.12 1998/10/20 15:33:21 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 215d97e60fcc..18e14935c00b 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
-.\"     $Id: printf.3,v 1.12 1999/07/25 17:38:59 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt PRINTF 3
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index 97115494c425..053ec8eb370e 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)printf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/putc.3 b/lib/libc/stdio/putc.3
index f772b1cb45cb..d251174c732d 100644
--- a/lib/libc/stdio/putc.3
+++ b/lib/libc/stdio/putc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt PUTC 3
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index e231d0e3b7d9..fe1591c0dec4 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: putc.c,v 1.5 1997/02/22 15:02:17 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
index 57400d300c73..cebd872c38cb 100644
--- a/lib/libc/stdio/putchar.c
+++ b/lib/libc/stdio/putchar.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: putchar.c,v 1.5 1997/02/22 15:02:19 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 13a0fdf01a00..59f153d68b32 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)puts.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: puts.c,v 1.5 1997/02/22 15:02:20 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index 140b8d41bd54..8eac4cfd8188 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)putw.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: putw.c,v 1.5 1997/02/22 15:02:21 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index c05c5d47d58a..87938302157f 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)refill.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: refill.c,v 1.6 1997/02/22 15:02:22 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/remove.3 b/lib/libc/stdio/remove.3
index 591ae7ba8240..e9b380bcf325 100644
--- a/lib/libc/stdio/remove.3
+++ b/lib/libc/stdio/remove.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)remove.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt REMOVE 3
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index 6a255639c960..cca7cb627163 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)remove.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index c95adc7a1e24..98c5846306bb 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)rewind.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: rewind.c,v 1.5 1997/02/22 15:02:24 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index 8ccb507ac960..1144f5a18734 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt SCANF 3
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index 94f77beb424f..b183c1784ced 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)scanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: scanf.c,v 1.5 1997/02/22 15:02:25 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3
index 42a689c96dfa..1626bc1c94a9 100644
--- a/lib/libc/stdio/setbuf.3
+++ b/lib/libc/stdio/setbuf.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setbuf.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SETBUF 3
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
index d27217751e15..7db2d4d79a4e 100644
--- a/lib/libc/stdio/setbuffer.c
+++ b/lib/libc/stdio/setbuffer.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)setbuffer.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index a0c6512dbb14..4693b9f8a68b 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)setvbuf.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-		"$Id: setvbuf.c,v 1.5 1997/02/22 15:02:27 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index a4c04d94c0da..bedf98d353e6 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: snprintf.c,v 1.10 1997/12/24 23:54:13 ache Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <limits.h>
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index fb0514d5ff2b..10e73f07d452 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index d114ae3b9a0f..2ed797efdf90 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index 35a5763979c9..96484147ff77 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stdio.3	8.7 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt STDIO 3
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index 852e971336f2..e12dc28ab9dc 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <fcntl.h>
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index 803596a14e9c..5572654fa12f 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tempnam.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: tempnam.c,v 1.5 1997/02/22 15:02:37 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index dd85cbf8b0d7..f42dc2533dd0 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tmpnam.3	8.2 (Berkeley) 11/17/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt TMPFILE 3
diff --git a/lib/libc/stdio/ungetc.3 b/lib/libc/stdio/ungetc.3
index 262285b8c695..173513a8f987 100644
--- a/lib/libc/stdio/ungetc.3
+++ b/lib/libc/stdio/ungetc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt UNGETC 3
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index db3ff83d024f..3f4b32cb4313 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)ungetc.c	8.2 (Berkeley) 11/3/93";
 #endif
 static const char rcsid[] =
-		"$Id: ungetc.c,v 1.5 1997/02/22 15:02:38 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 3c509ac74161..37fb0fd93b6c 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static char rcsid[] = "$Id: vasprintf.c,v 1.9 1998/07/08 00:44:56 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 0ffbc7337a86..44fd34b045c3 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: vfprintf.c,v 1.20 1998/09/16 04:17:44 imp Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 95e870171a4b..6a832162fa20 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: vfscanf.c,v 1.12 1997/11/23 06:02:47 bde Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index 8d449d620e61..a3a2f633d10d 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index 729098b6c88d..53fb362c1692 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: vscanf.c,v 1.5 1997/02/22 15:02:43 peter Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index 6cf2d76b7150..b8e4c8c271cd 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: vsnprintf.c,v 1.10 1997/12/24 23:54:19 ache Exp $";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <limits.h>
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 911d97fa36fe..d357af0c297c 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index 4cfa6627079f..5a5f8c802e2a 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index b85ac51fa8e1..847699ad7cf4 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index 74f0f7755d13..074a880e66d5 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)wsetup.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index 8d59f461b919..d1b4b2abc892 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
-#	$Id: Makefile.inc,v 1.16 1998/09/14 20:34:34 imp Exp $
+# $FreeBSD$
 
 # machine-independent stdlib sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib ${.CURDIR}/../libc/stdlib
diff --git a/lib/libc/stdlib/abort.3 b/lib/libc/stdlib/abort.3
index c22f958abb04..02f369ea8e69 100644
--- a/lib/libc/stdlib/abort.3
+++ b/lib/libc/stdlib/abort.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)abort.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ABORT 3
diff --git a/lib/libc/stdlib/abs.3 b/lib/libc/stdlib/abs.3
index 501263ebd84c..7c2db0d2e9e0 100644
--- a/lib/libc/stdlib/abs.3
+++ b/lib/libc/stdlib/abs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)abs.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ABS 3
diff --git a/lib/libc/stdlib/alloca.3 b/lib/libc/stdlib/alloca.3
index 266b37c72894..e3edce8d4158 100644
--- a/lib/libc/stdlib/alloca.3
+++ b/lib/libc/stdlib/alloca.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)alloca.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ALLOCA 3
diff --git a/lib/libc/stdlib/atexit.3 b/lib/libc/stdlib/atexit.3
index 8755fbbb1aac..1ba69fb30f3d 100644
--- a/lib/libc/stdlib/atexit.3
+++ b/lib/libc/stdlib/atexit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atexit.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ATEXIT 3
diff --git a/lib/libc/stdlib/atof.3 b/lib/libc/stdlib/atof.3
index 1604feae06d4..d09bceea189f 100644
--- a/lib/libc/stdlib/atof.3
+++ b/lib/libc/stdlib/atof.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atof.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ATOF 3
diff --git a/lib/libc/stdlib/atoi.3 b/lib/libc/stdlib/atoi.3
index 9c20bcdecbcc..8292c912bbb5 100644
--- a/lib/libc/stdlib/atoi.3
+++ b/lib/libc/stdlib/atoi.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atoi.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ATOI 3
diff --git a/lib/libc/stdlib/atol.3 b/lib/libc/stdlib/atol.3
index 4a8ef3a90a94..0165f609885f 100644
--- a/lib/libc/stdlib/atol.3
+++ b/lib/libc/stdlib/atol.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atol.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ATOL 3
diff --git a/lib/libc/stdlib/bsearch.3 b/lib/libc/stdlib/bsearch.3
index 8e6be579f48c..6a7c06f976b1 100644
--- a/lib/libc/stdlib/bsearch.3
+++ b/lib/libc/stdlib/bsearch.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bsearch.3	8.3 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt BSEARCH 3
diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3
index 37a978408e0f..f596aa3122a5 100644
--- a/lib/libc/stdlib/div.3
+++ b/lib/libc/stdlib/div.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)div.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt DIV 3
diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3
index 6f6465e5ff67..15531f9143ee 100644
--- a/lib/libc/stdlib/exit.3
+++ b/lib/libc/stdlib/exit.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exit.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt EXIT 3
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
index dd6fb3599880..3347bda08441 100644
--- a/lib/libc/stdlib/getenv.3
+++ b/lib/libc/stdlib/getenv.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getenv.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt GETENV 3
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index 3916557f9d99..d6cb07959caf 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 27, 1995
 .Dt GETOPT 3
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
index c3a56b091a6a..62898dc4c1a9 100644
--- a/lib/libc/stdlib/getsubopt.3
+++ b/lib/libc/stdlib/getsubopt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsubopt.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt GETSUBOPT 3
diff --git a/lib/libc/stdlib/labs.3 b/lib/libc/stdlib/labs.3
index 34305b8143ba..88dfbd6a8fc0 100644
--- a/lib/libc/stdlib/labs.3
+++ b/lib/libc/stdlib/labs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)labs.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt LABS 3
diff --git a/lib/libc/stdlib/ldiv.3 b/lib/libc/stdlib/ldiv.3
index 56f2bcb89c5b..d3b65a8fff8b 100644
--- a/lib/libc/stdlib/ldiv.3
+++ b/lib/libc/stdlib/ldiv.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ldiv.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt LDIV 3
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index e0f60bdca146..55dffd6007d3 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\"     $Id: malloc.3,v 1.19 1999/08/14 07:33:15 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 27, 1996
 .Dt MALLOC 3
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 50ef6db787d1..02d936462b93 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: malloc.c,v 1.44 1999/03/28 14:16:05 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libc/stdlib/memory.3 b/lib/libc/stdlib/memory.3
index 0a1fed4982f2..4480338f14e8 100644
--- a/lib/libc/stdlib/memory.3
+++ b/lib/libc/stdlib/memory.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memory.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MEMORY 3
diff --git a/lib/libc/stdlib/netbsd_strtod.c b/lib/libc/stdlib/netbsd_strtod.c
index 72cd366ff8db..a402b688f0cf 100644
--- a/lib/libc/stdlib/netbsd_strtod.c
+++ b/lib/libc/stdlib/netbsd_strtod.c
@@ -1,5 +1,5 @@
 /*	From: NetBSD: strtod.c,v 1.26 1998/02/03 18:44:21 perry Exp */
-/*	$Id$	*/
+/* $FreeBSD$	*/
 
 /****************************************************************
  *
diff --git a/lib/libc/stdlib/qsort.3 b/lib/libc/stdlib/qsort.3
index 69ab459ca02e..0351df2bbba3 100644
--- a/lib/libc/stdlib/qsort.3
+++ b/lib/libc/stdlib/qsort.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)qsort.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt QSORT 3
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index ff3def5bcec6..8adb7141f852 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
diff --git a/lib/libc/stdlib/radixsort.3 b/lib/libc/stdlib/radixsort.3
index 292325be603c..7212a2e73401 100644
--- a/lib/libc/stdlib/radixsort.3
+++ b/lib/libc/stdlib/radixsort.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)radixsort.3	8.2 (Berkeley) 1/27/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd January 27, 1994
 .Dt RADIXSORT 3
diff --git a/lib/libc/stdlib/rand.3 b/lib/libc/stdlib/rand.3
index c7c0a37084b9..1330cc76b1ae 100644
--- a/lib/libc/stdlib/rand.3
+++ b/lib/libc/stdlib/rand.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rand.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd May 25, 1999
 .Dt RAND 3
diff --git a/lib/libc/stdlib/random.3 b/lib/libc/stdlib/random.3
index c57dd84913b5..9cd2e0dc80ca 100644
--- a/lib/libc/stdlib/random.3
+++ b/lib/libc/stdlib/random.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)random.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RANDOM 3
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index 4737e40814f2..8be99b4bc2a2 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: random.c,v 1.9 1997/06/14 00:13:56 ache Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
index 6e279981a6fc..e9327e603117 100644
--- a/lib/libc/stdlib/reallocf.c
+++ b/lib/libc/stdlib/reallocf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 
diff --git a/lib/libc/stdlib/realpath.3 b/lib/libc/stdlib/realpath.3
index 81a331574c9d..fa7323d78bab 100644
--- a/lib/libc/stdlib/realpath.3
+++ b/lib/libc/stdlib/realpath.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)realpath.3	8.2 (Berkeley) 2/16/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 16, 1994
 .Dt REALPATH 3
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
index db339ac0d09a..aa8054f59b7a 100644
--- a/lib/libc/stdlib/strtod.3
+++ b/lib/libc/stdlib/strtod.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtod.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRTOD 3
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index abd63a216680..898f6573b607 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtol.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRTOL 3
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index 56cca674cce4..a877ce20c0b1 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strtoul.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRTOUL 3
diff --git a/lib/libc/stdlib/system.3 b/lib/libc/stdlib/system.3
index 3c612778fa24..218a459ee352 100644
--- a/lib/libc/stdlib/system.3
+++ b/lib/libc/stdlib/system.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)system.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SYSTEM 3
diff --git a/lib/libc/stdtime/Makefile.inc b/lib/libc/stdtime/Makefile.inc
index dd6f90cd330c..39daaa661ed8 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
-#	$Id: Makefile.inc,v 1.7 1997/10/21 08:41:14 bde Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../libc/stdtime
 
diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3
index 2b8ca3e45adc..89d06ed09d53 100644
--- a/lib/libc/stdtime/ctime.3
+++ b/lib/libc/stdtime/ctime.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ctime.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 2, 1999
 .Dt CTIME 3
diff --git a/lib/libc/stdtime/strftime.3 b/lib/libc/stdtime/strftime.3
index 34777198398f..cac3124fe531 100644
--- a/lib/libc/stdtime/strftime.3
+++ b/lib/libc/stdtime/strftime.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strftime.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd October 4, 1997
 .Dt STRFTIME 3
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 98a4b8d012fa..b70b216296ff 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -17,7 +17,7 @@
 
 #ifdef LIBC_RCS
 static const char rcsid[] =
-	"$Id: strftime.c,v 1.19 1997/10/03 19:06:57 helbig Exp $";
+  "$FreeBSD$";
 #endif
 
 #ifndef lint
diff --git a/lib/libc/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index 99568c95f2b7..d6aa4a276941 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.
 .\"
-.\" $Id: strptime.3,v 1.4 1999/04/25 07:28:39 wes Exp $
+.\" $FreeBSD$
 .\" "
 .Dd May 8, 1997
 .Dt STRPTIME 3
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index a96cefc693eb..a49db8856f84 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -53,7 +53,7 @@
 
 #ifdef LIBC_RCS
 static const char rcsid[] =
-	"$Id: strptime.c,v 1.6 1999/04/25 07:28:39 wes Exp $";
+  "$FreeBSD$";
 #endif
 
 #ifndef lint
diff --git a/lib/libc/stdtime/time2posix.3 b/lib/libc/stdtime/time2posix.3
index 1166f5e41bae..7abd2610c95e 100644
--- a/lib/libc/stdtime/time2posix.3
+++ b/lib/libc/stdtime/time2posix.3
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1996
 .Dt TIME2POSIX 3
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index 31f0340c4187..b46c20df38fc 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: timelocal.c,v 1.1 1997/08/09 15:43:57 joerg Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libc/stdtime/timelocal.h b/lib/libc/stdtime/timelocal.h
index 8593aee3ec3e..314c48c297bd 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.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libc/stdtime/tzfile.5 b/lib/libc/stdtime/tzfile.5
index 946ae4807272..c7b1fc797e4f 100644
--- a/lib/libc/stdtime/tzfile.5
+++ b/lib/libc/stdtime/tzfile.5
@@ -1,4 +1,4 @@
-.\"	$Id: tzfile.5,v 1.6 1999/01/20 18:54:12 wollman Exp $
+.\" $FreeBSD$
 .Dd September 13, 1994
 .Dt TZFILE 5
 .Os FreeBSD 3.0
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 18069204e06b..6e0569175bc4 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
-#	$Id: Makefile.inc,v 1.17 1999/05/19 06:32:00 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string
 
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
index 0be54dd19623..c7902125186e 100644
--- a/lib/libc/string/bcmp.3
+++ b/lib/libc/string/bcmp.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bcmp.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt BCMP 3
diff --git a/lib/libc/string/bcopy.3 b/lib/libc/string/bcopy.3
index 90d55ed16275..7d44916ef796 100644
--- a/lib/libc/string/bcopy.3
+++ b/lib/libc/string/bcopy.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bcopy.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt BCOPY 3
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
index 97473d9f2314..a1c091fa52b5 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bstring.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt BSTRING 3
diff --git a/lib/libc/string/bzero.3 b/lib/libc/string/bzero.3
index 2d12f5bbf3b1..78dd8c0bb2df 100644
--- a/lib/libc/string/bzero.3
+++ b/lib/libc/string/bzero.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bzero.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt BZERO 3
diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3
index b4a464737745..2794a441e566 100644
--- a/lib/libc/string/ffs.3
+++ b/lib/libc/string/ffs.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ffs.3	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt FFS 3
diff --git a/lib/libc/string/index.3 b/lib/libc/string/index.3
index 0db9e63d3c02..298101d5415c 100644
--- a/lib/libc/string/index.3
+++ b/lib/libc/string/index.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)index.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt INDEX 3
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index 4b9530c5aa7b..794486fee9db 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memccpy.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt MEMCCPY 3
diff --git a/lib/libc/string/memchr.3 b/lib/libc/string/memchr.3
index 5b83737cad76..2469d60c5cbf 100644
--- a/lib/libc/string/memchr.3
+++ b/lib/libc/string/memchr.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memchr.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MEMCHR 3
diff --git a/lib/libc/string/memcmp.3 b/lib/libc/string/memcmp.3
index 4fbee334f0e1..3939425df127 100644
--- a/lib/libc/string/memcmp.3
+++ b/lib/libc/string/memcmp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memcmp.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MEMCMP 3
diff --git a/lib/libc/string/memcpy.3 b/lib/libc/string/memcpy.3
index 8e3104cfb5af..942c52178c57 100644
--- a/lib/libc/string/memcpy.3
+++ b/lib/libc/string/memcpy.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memcpy.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MEMCPY 3
diff --git a/lib/libc/string/memmove.3 b/lib/libc/string/memmove.3
index fe5301b5ba39..73556009d321 100644
--- a/lib/libc/string/memmove.3
+++ b/lib/libc/string/memmove.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memmove.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MEMMOVE 3
diff --git a/lib/libc/string/memset.3 b/lib/libc/string/memset.3
index e610ae52f8a7..9896514cc9e0 100644
--- a/lib/libc/string/memset.3
+++ b/lib/libc/string/memset.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)memset.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MEMSET 3
diff --git a/lib/libc/string/rindex.3 b/lib/libc/string/rindex.3
index 93da773bff59..7a5c478dfb27 100644
--- a/lib/libc/string/rindex.3
+++ b/lib/libc/string/rindex.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rindex.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RINDEX 3
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index 5231a0a05897..1dd5f80ddfda 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcasecmp.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt STRCASECMP 3
diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3
index a0397a732b4c..c1695d793bf8 100644
--- a/lib/libc/string/strcat.3
+++ b/lib/libc/string/strcat.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcat.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRCAT 3
diff --git a/lib/libc/string/strchr.3 b/lib/libc/string/strchr.3
index c4de79b8d430..8b5b892a7def 100644
--- a/lib/libc/string/strchr.3
+++ b/lib/libc/string/strchr.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strchr.3	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt STRCHR 3
diff --git a/lib/libc/string/strcmp.3 b/lib/libc/string/strcmp.3
index 97aacb32bd32..45abbc43827a 100644
--- a/lib/libc/string/strcmp.3
+++ b/lib/libc/string/strcmp.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcmp.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRCMP 3
diff --git a/lib/libc/string/strcoll.3 b/lib/libc/string/strcoll.3
index 10d793a83e8d..2d72fe3a5224 100644
--- a/lib/libc/string/strcoll.3
+++ b/lib/libc/string/strcoll.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcoll.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRCOLL 3
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index 259ca2346c62..b4631a1f00ad 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/lib/libc/string/strcpy.3 b/lib/libc/string/strcpy.3
index 1062cfa54bcb..a30c22677634 100644
--- a/lib/libc/string/strcpy.3
+++ b/lib/libc/string/strcpy.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRCPY 3
diff --git a/lib/libc/string/strcspn.3 b/lib/libc/string/strcspn.3
index d7f6603f5d0b..6590cb57f4ed 100644
--- a/lib/libc/string/strcspn.3
+++ b/lib/libc/string/strcspn.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcspn.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRCSPN 3
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
index c99b41673fec..53c1d39bf3b2 100644
--- a/lib/libc/string/strdup.3
+++ b/lib/libc/string/strdup.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strdup.3	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt STRDUP 3
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index 4376d9c96fdd..a0f6b42f60a6 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strerror.3	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt STRERROR 3
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index 462482f1d6fb..947a745377a7 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)string.3	8.2 (Berkeley) 12/11/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt STRING 3
diff --git a/lib/libc/string/strlen.3 b/lib/libc/string/strlen.3
index f248b74455e1..6514424de53f 100644
--- a/lib/libc/string/strlen.3
+++ b/lib/libc/string/strlen.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strlen.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRLEN 3
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
index f81ea083731d..ca9bbc167a4c 100644
--- a/lib/libc/string/strmode.3
+++ b/lib/libc/string/strmode.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strmode.3	8.3 (Berkeley) 7/28/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1994
 .Dt STRMODE 3
diff --git a/lib/libc/string/strpbrk.3 b/lib/libc/string/strpbrk.3
index a5b128209fa6..2b5cf127530a 100644
--- a/lib/libc/string/strpbrk.3
+++ b/lib/libc/string/strpbrk.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strpbrk.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRPBRK 3
diff --git a/lib/libc/string/strrchr.3 b/lib/libc/string/strrchr.3
index 6caedeb79a4f..c44996acfb9e 100644
--- a/lib/libc/string/strrchr.3
+++ b/lib/libc/string/strrchr.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strrchr.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRRCHR 3
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index 3fd0d2959d36..f66d79e28f75 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)strsep.3	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt STRSEP 3
diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3
index 43f607938c0a..a33abc79dc93 100644
--- a/lib/libc/string/strspn.3
+++ b/lib/libc/string/strspn.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strspn.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRSPN 3
diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3
index 7d32d68a0663..dfd7ac21589a 100644
--- a/lib/libc/string/strstr.3
+++ b/lib/libc/string/strstr.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strstr.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRSTR 3
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 1c6ee8b04e0a..26b3a1dfba7c 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
-.\"     $Id: strtok.3,v 1.6 1999/07/12 20:48:13 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 27, 1998
 .Dt STRTOK 3
diff --git a/lib/libc/string/strxfrm.3 b/lib/libc/string/strxfrm.3
index d4758c19430e..81b07f657acb 100644
--- a/lib/libc/string/strxfrm.3
+++ b/lib/libc/string/strxfrm.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STRXFRM 3
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index 26c4442ded9a..ac172f8bc208 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strxfrm.c,v 1.9 1998/06/05 09:49:51 ache Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/lib/libc/string/swab.3 b/lib/libc/string/swab.3
index f326bd388f00..13be3ebc4755 100644
--- a/lib/libc/string/swab.3
+++ b/lib/libc/string/swab.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swab.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SWAB 3
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 6db7a60dcee8..4c268ff2b600 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
-#	$Id: Makefile.inc,v 1.65 1999/07/30 11:32:06 mpp Exp $
+# $FreeBSD$
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys ${.CURDIR}/../libc/sys
diff --git a/lib/libc/sys/_exit.2 b/lib/libc/sys/_exit.2
index de3f1b59cf0c..cd8688b83687 100644
--- a/lib/libc/sys/_exit.2
+++ b/lib/libc/sys/_exit.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)_exit.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: _exit.2,v 1.7 1997/02/22 15:03:36 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt EXIT 2
diff --git a/lib/libc/sys/accept.2 b/lib/libc/sys/accept.2
index 1d78ea80450d..211904ec2e6f 100644
--- a/lib/libc/sys/accept.2
+++ b/lib/libc/sys/accept.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)accept.2	8.2 (Berkeley) 12/11/93
-.\"     $Id: accept.2,v 1.6 1998/11/16 03:49:39 nectar Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt ACCEPT 2
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index cf1fe90cb526..9b1c03612cbf 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)access.2	8.2 (Berkeley) 4/1/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt ACCESS 2
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
index 0b8cd10b09ce..e0d93ae42831 100644
--- a/lib/libc/sys/acct.2
+++ b/lib/libc/sys/acct.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acct.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ACCT 2
diff --git a/lib/libc/sys/adjtime.2 b/lib/libc/sys/adjtime.2
index 61b2dbe1dbc6..03f1b583d984 100644
--- a/lib/libc/sys/adjtime.2
+++ b/lib/libc/sys/adjtime.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)adjtime.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ADJTIME 2
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 5adbdb8e949c..275c3eb7b486 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.
 .\"
-.\"	$Id: aio_cancel.2,v 1.3 1999/07/01 21:13:06 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1999
 .Dt AIO_CANCEL 2
diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2
index cedc5d9ec9f9..ae959ab14c76 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.
 .\"
-.\"	$Id: aio_error.2,v 1.3 1999/07/01 21:13:06 mpp Exp $
+.\" $FreeBSD$
 .\"
 .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 89b78a167229..438b64741cf4 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.
 .\"
-.\"	$Id: aio_read.2,v 1.4 1999/07/01 21:09:56 mpp Exp $
+.\" $FreeBSD$
 .\"
 .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 804452f9c3e6..7f70fc30a962 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.
 .\"
-.\"	$Id: aio_return.2,v 1.3 1999/07/01 21:13:06 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1999
 .Dt AIO_RETURN 2
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libc/sys/aio_suspend.2
index 5df78b4d8047..ca416b7e8117 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.
 .\"
-.\"	$Id: aio_suspend.2,v 1.3 1999/07/01 21:13:06 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1999
 .Dt AIO_SUSPEND 2
diff --git a/lib/libc/sys/aio_write.2 b/lib/libc/sys/aio_write.2
index 04ecf201e85a..8e554237dfd7 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.
 .\"
-.\"	$Id: aio_write.2,v 1.2 1999/07/01 21:09:57 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1999
 .Dt AIO_WRITE 2
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index f091df051f36..8d5a0d2c1119 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: bind.2,v 1.7 1999/06/10 22:48:27 markm Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt BIND 2
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index 8fd989ecc508..4db60729ebbd 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)brk.2	8.4 (Berkeley) 5/1/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt BRK 2
diff --git a/lib/libc/sys/chdir.2 b/lib/libc/sys/chdir.2
index 215d75998f52..51622f8686ad 100644
--- a/lib/libc/sys/chdir.2
+++ b/lib/libc/sys/chdir.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chdir.2	8.2 (Berkeley) 12/11/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt CHDIR 2
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 224ccdf50a1e..6a3633f1471f 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.2	8.3 (Berkeley) 5/2/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1995
 .Dt CHFLAGS 2
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index d89d080ff712..87e171f0c22a 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: chmod.2,v 1.13 1999/07/30 10:08:21 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CHMOD 2
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index af1875c3116c..6411045be604 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
-.\"	$Id: chown.2,v 1.10 1997/03/31 12:37:35 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt CHOWN 2
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
index 8e51a6856481..7f1a8665471e 100644
--- a/lib/libc/sys/chroot.2
+++ b/lib/libc/sys/chroot.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chroot.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CHROOT 2
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index bead0a9af45b..4e0dd5511cad 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -1,5 +1,5 @@
 .\"	$OpenBSD: clock_gettime.2,v 1.4 1997/05/08 20:21:16 kstailey Exp $
-.\"	$Id: clock_gettime.2,v 1.1 1997/05/12 12:13:10 peter Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libc/sys/close.2 b/lib/libc/sys/close.2
index 0e84526b1d78..4a478e4fe2f2 100644
--- a/lib/libc/sys/close.2
+++ b/lib/libc/sys/close.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)close.2	8.2 (Berkeley) 4/19/94
-.\"	$Id: close.2,v 1.8 1997/02/22 15:03:47 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt CLOSE 2
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index e290a5958c03..bd42550453ab 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CONNECT 2
diff --git a/lib/libc/sys/dup.2 b/lib/libc/sys/dup.2
index 58a967d22e01..6f86325badcf 100644
--- a/lib/libc/sys/dup.2
+++ b/lib/libc/sys/dup.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dup.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: dup.2,v 1.7 1997/02/22 15:03:49 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt DUP 2
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 2fedc264e4a7..2adc7c9d9ec0 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)execve.2	8.5 (Berkeley) 6/1/94
-.\"     $Id: execve.2,v 1.13 1999/08/14 06:17:24 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 1, 1994
 .Dt EXECVE 2
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index b0e1b44f7ea1..97236fe28b39 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fcntl.2	8.2 (Berkeley) 1/12/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd January 12, 1994
 .Dt FCNTL 2
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2
index 2c912f72916a..4d3fb06c09a1 100644
--- a/lib/libc/sys/flock.2
+++ b/lib/libc/sys/flock.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)flock.2	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt FLOCK 2
diff --git a/lib/libc/sys/fork.2 b/lib/libc/sys/fork.2
index 38c54092eae9..2e76bc0998aa 100644
--- a/lib/libc/sys/fork.2
+++ b/lib/libc/sys/fork.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fork.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FORK 2
diff --git a/lib/libc/sys/fsync.2 b/lib/libc/sys/fsync.2
index fcd3c338b1e9..a83ebcb0b7da 100644
--- a/lib/libc/sys/fsync.2
+++ b/lib/libc/sys/fsync.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fsync.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FSYNC 2
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index f9e57951fc50..a3ca671376ed 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getdirentries.2	8.2 (Berkeley) 5/3/95
-.\"	$Id: getdirentries.2,v 1.10 1999/07/12 20:48:23 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 3, 1995
 .Dt GETDIRENTRIES 2
diff --git a/lib/libc/sys/getdtablesize.2 b/lib/libc/sys/getdtablesize.2
index cf1661f93a5e..a572c22d603a 100644
--- a/lib/libc/sys/getdtablesize.2
+++ b/lib/libc/sys/getdtablesize.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getdtablesize.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETDTABLESIZE 2
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
index 92a627cbb18d..e64babfdd23d 100644
--- a/lib/libc/sys/getfh.2
+++ b/lib/libc/sys/getfh.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getfh.2	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt GETFH 2
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index 9ba31e5e7860..3dc87bcae682 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getfsstat.2	8.3 (Berkeley) 5/25/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 25, 1995
 .Dt GETFSSTAT 2
diff --git a/lib/libc/sys/getgid.2 b/lib/libc/sys/getgid.2
index 3487ed000624..d9c4db4303b5 100644
--- a/lib/libc/sys/getgid.2
+++ b/lib/libc/sys/getgid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgid.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETGID 2
diff --git a/lib/libc/sys/getgroups.2 b/lib/libc/sys/getgroups.2
index 82a93386deeb..ab1d02902ff4 100644
--- a/lib/libc/sys/getgroups.2
+++ b/lib/libc/sys/getgroups.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getgroups.2	8.2 (Berkeley) 4/16/94
-.\"     $Id: getgroups.2,v 1.4 1998/01/13 01:30:17 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 5, 1999
 .Dt GETGROUPS 2
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
index 4b2c9aa64013..b60349a67024 100644
--- a/lib/libc/sys/getitimer.2
+++ b/lib/libc/sys/getitimer.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getitimer.2	8.3 (Berkeley) 5/16/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd May 16, 1995
 .Dt GETITIMER 2
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index d1721c206958..31176887127d 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getlogin.2	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt GETLOGIN 2
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
index 846c9eb4cdb9..cdf69f15edcc 100644
--- a/lib/libc/sys/getpeername.2
+++ b/lib/libc/sys/getpeername.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpeername.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETPEERNAME 2
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2
index aa6e7e249872..9f5ba3eef130 100644
--- a/lib/libc/sys/getpgrp.2
+++ b/lib/libc/sys/getpgrp.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpgrp.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETPGRP 2
diff --git a/lib/libc/sys/getpid.2 b/lib/libc/sys/getpid.2
index d9bce03bc859..5a282b1583cf 100644
--- a/lib/libc/sys/getpid.2
+++ b/lib/libc/sys/getpid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpid.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: getpid.2,v 1.6 1997/02/22 15:03:51 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETPID 2
diff --git a/lib/libc/sys/getpriority.2 b/lib/libc/sys/getpriority.2
index ae597d844d88..3a6eee40fcc2 100644
--- a/lib/libc/sys/getpriority.2
+++ b/lib/libc/sys/getpriority.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpriority.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETPRIORITY 2
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index b6df06e2af6c..d04e48911a02 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrlimit.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETRLIMIT 2
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index 0e1071d04deb..dcbda2d45c2d 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
-.\"     $Id: getrusage.2,v 1.8 1998/01/13 01:21:19 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETRUSAGE 2
diff --git a/lib/libc/sys/getsid.2 b/lib/libc/sys/getsid.2
index a08290a2e87f..4a7f13e01d2e 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.
 .\"
-.\"	$Id: getsid.2,v 1.1 1997/08/19 07:19:43 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 19, 1997
 .Dt GETSID 2
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index e8afc14edc34..9330a3e7d9e5 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsockname.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETSOCKNAME 2
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 3a8e7599fe6a..6cc8e49a2e4f 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
-.\"	$Id: getsockopt.2,v 1.9 1997/03/11 11:35:50 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1995
 .Dt GETSOCKOPT 2
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index c3a5a211439a..7ac615c9518b 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd May 26, 1995
 .Dt GETTIMEOFDAY 2
diff --git a/lib/libc/sys/getuid.2 b/lib/libc/sys/getuid.2
index 9808cb270c44..ae6c94659daa 100644
--- a/lib/libc/sys/getuid.2
+++ b/lib/libc/sys/getuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getuid.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: getuid.2,v 1.5 1997/02/22 15:03:54 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETUID 2
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 4c4b8475f3cf..fd978ca4ceb4 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
-.\"     $Id: intro.2,v 1.17 1999/07/12 20:48:31 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 27, 1995
 .Dt INTRO 2
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index 821974a1d9a1..703e1ee5a345 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ioctl.2	8.2 (Berkeley) 12/11/93
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt IOCTL 2
diff --git a/lib/libc/sys/issetugid.2 b/lib/libc/sys/issetugid.2
index 551ac435d84d..bc131081f55a 100644
--- a/lib/libc/sys/issetugid.2
+++ b/lib/libc/sys/issetugid.2
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: issetugid.2,v 1.4 1997/04/01 18:50:56 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd August, 25 1996
 .Dt ISSETUGID 2
diff --git a/lib/libc/sys/jail.2 b/lib/libc/sys/jail.2
index bba076b1c070..90bd85762b92 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
 .\"----------------------------------------------------------------------------
 .\"
-.\"$Id: jail.2,v 1.4 1999/07/09 21:35:37 phk Exp $
+.\"$FreeBSD$
 .\"
 .\"
 .Dd April 28, 1999
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index ea58d1aea7fa..c8667d890218 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kill.2	8.3 (Berkeley) 4/19/94
-.\"	$Id: kill.2,v 1.8 1999/06/18 10:24:12 ru Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt KILL 2
diff --git a/lib/libc/sys/kldfind.2 b/lib/libc/sys/kldfind.2
index 8aa85d922b41..4e4e71dcca3e 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.
 .\"
-.\"	$Id: kldfind.2,v 1.2 1999/04/09 14:31:59 bde Exp $	
+.\" $FreeBSD$	
 .\"
 .Dd March 3, 1999
 .Dt KLDFIND 2
diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libc/sys/kldfirstmod.2
index c23c7a985c5e..f5901c4b4329 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.
 .\"
-.\"	$Id: kldfirstmod.2,v 1.2 1999/04/09 14:31:59 bde Exp $	
+.\" $FreeBSD$	
 .\"
 .Dd March 3, 1999
 .Dt KLDFIRSTMOD 2
diff --git a/lib/libc/sys/kldload.2 b/lib/libc/sys/kldload.2
index f5e717e12521..8df9ffae2146 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.
 .\"
-.\"	$Id: kldload.2,v 1.2 1999/04/09 14:31:59 bde Exp $
+.\" $FreeBSD$
 .\"
 
 .Dd March 3, 1999
diff --git a/lib/libc/sys/kldnext.2 b/lib/libc/sys/kldnext.2
index 78f3d0511f8c..c253dc27e14b 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.
 .\"
-.\"	$Id: kldnext.2,v 1.2 1999/04/09 14:31:59 bde Exp $	
+.\" $FreeBSD$	
 .\"
 .Dd March 3, 1999
 .Dt KLDNEXT 2
diff --git a/lib/libc/sys/kldstat.2 b/lib/libc/sys/kldstat.2
index 64a87540d785..91fb58e8553a 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.
 .\"
-.\"	$Id: kldstat.2,v 1.2 1999/04/09 14:31:59 bde Exp $	
+.\" $FreeBSD$	
 .\"
 .Dd March 3, 1999
 .Dt KLDSTAT 2
diff --git a/lib/libc/sys/kldunload.2 b/lib/libc/sys/kldunload.2
index bbe0d76a73cf..92a16e20900d 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.
 .\"
-.\"	$Id: kldunload.2,v 1.3 1999/07/01 12:16:06 sheldonh Exp $
+.\" $FreeBSD$
 .\"
 
 .Dd March 3, 1999
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index 8cc861ba9472..e15aeea45e69 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
-.\"     $Id: ktrace.2,v 1.6 1997/02/22 15:03:57 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt KTRACE 2
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 3cef38716091..a1b6d4ba5803 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)link.2	8.3 (Berkeley) 1/12/94
-.\"	$Id: link.2,v 1.9 1998/01/15 04:31:28 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd Mar 5, 1999
 .Dt LINK 2
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index 80b44dda118a..4f87434316dd 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
-.\"	$Id: listen.2,v 1.10 1997/04/11 18:47:06 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 3, 1995
 .Dt LISTEN 2
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index 538ec114494e..aaccac7f7c4e 100644
--- a/lib/libc/sys/lseek.2
+++ b/lib/libc/sys/lseek.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lseek.2	8.3 (Berkeley) 4/19/94
-.\"	$Id: lseek.2,v 1.6 1997/02/22 15:04:01 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt LSEEK 2
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index 6a345050c582..415af6802848 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
-.\"	$Id: madvise.2,v 1.13 1998/06/04 21:05:44 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd Jul 19, 1996
 .Dt MADVISE 2
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index 541140551334..533c1530ca3c 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mincore.2	8.1 (Berkeley) 6/9/93
-.\"	$Id: mincore.2,v 1.11 1998/06/04 21:05:45 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt MINCORE 2
diff --git a/lib/libc/sys/minherit.2 b/lib/libc/sys/minherit.2
index 572e9b8f2fe5..66dbb0b45d51 100644
--- a/lib/libc/sys/minherit.2
+++ b/lib/libc/sys/minherit.2
@@ -1,4 +1,4 @@
-.\"	$Id: minherit.2,v 1.5 1997/12/31 01:21:50 alex Exp $
+.\" $FreeBSD$
 .\"
 .\" 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 682ef92abdbc..c2d88350b9cd 100644
--- a/lib/libc/sys/mkdir.2
+++ b/lib/libc/sys/mkdir.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdir.2	8.2 (Berkeley) 12/11/93
-.\"	$Id: mkdir.2,v 1.7 1998/01/20 03:50:48 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt MKDIR 2
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index 5b638378e37d..36ab7347a25f 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkfifo.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: mkfifo.2,v 1.7 1998/01/20 03:52:49 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MKFIFO 2
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index 745fa1e4cfde..90287b271e29 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
-.\"     $Id: mknod.2,v 1.7 1999/07/12 20:48:32 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt MKNOD 2
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
index 18369a59d3a1..b5706b041423 100644
--- a/lib/libc/sys/mlock.2
+++ b/lib/libc/sys/mlock.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
-.\"	$Id: mlock.2,v 1.4 1998/01/20 03:59:07 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 2, 1993
 .Dt MLOCK 2
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index a1d2045023af..6e3619e4ae0f 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 11, 1995
 .Dt MMAP 2
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 462366a04ea1..d4959edcc93c 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.2	8.3 (Berkeley) 5/24/95
-.\"     $Id: mount.2,v 1.18 1999/07/12 20:48:33 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 24, 1995
 .Dt MOUNT 2
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index 2b5ff0bc79e2..533b1fedd4e9 100644
--- a/lib/libc/sys/mprotect.2
+++ b/lib/libc/sys/mprotect.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mprotect.2	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt MPROTECT 2
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index 32a143d0dd6a..7a86cd414070 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msync.2	8.2 (Berkeley) 6/21/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 21, 1994
 .Dt MSYNC 2
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index 478f1c304b29..e2c89bf3836e 100644
--- a/lib/libc/sys/munmap.2
+++ b/lib/libc/sys/munmap.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)munmap.2	8.3 (Berkeley) 5/27/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 27, 1994
 .Dt MUNMAP 2
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libc/sys/nanosleep.2
index ae1b384a4fad..c560582c4026 100644
--- a/lib/libc/sys/nanosleep.2
+++ b/lib/libc/sys/nanosleep.2
@@ -1,4 +1,4 @@
-.\"	$Id: nanosleep.2,v 1.5 1998/05/03 22:50:14 jraynard Exp $
+.\" $FreeBSD$
 .\"	$OpenBSD: nanosleep.2,v 1.1 1997/04/20 20:56:20 tholo Exp $
 .\"	$NetBSD: nanosleep.2,v 1.1 1997/04/17 18:12:02 jtc Exp $
 .\"
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index cc3ed5245c51..5d0eb3bfa9be 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfssvc.2	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt NFSSVC 2
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index 7073a48186b8..2a9104058fd5 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)open.2	8.2 (Berkeley) 11/16/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd November 16, 1993
 .Dt OPEN 2
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index 7a4f13002ed8..8631648221ca 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pathconf.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt PATHCONF 2
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
index 613df69392ad..1151505a255b 100644
--- a/lib/libc/sys/pipe.2
+++ b/lib/libc/sys/pipe.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pipe.2	8.1 (Berkeley) 6/4/93
-.\"     $Id: pipe.2,v 1.10 1999/07/30 12:45:20 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt PIPE 2
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index 1f5248b22293..ea5b27088ae9 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 $
-.\"	$Id: poll.2,v 1.2 1998/06/04 21:05:45 steve Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
 .\"
diff --git a/lib/libc/sys/profil.2 b/lib/libc/sys/profil.2
index b0815fa5d5bf..a6298031f478 100644
--- a/lib/libc/sys/profil.2
+++ b/lib/libc/sys/profil.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)profil.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: profil.2,v 1.7 1997/06/23 04:02:01 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt PROFIL 2
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 48468a58c7ad..37eca05a3de7 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -1,4 +1,4 @@
-.\"	$Id: ptrace.2,v 1.9 1997/02/22 15:04:13 peter Exp $
+.\" $FreeBSD$
 .\"	$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/quotactl.2 b/lib/libc/sys/quotactl.2
index bfab2379b3ff..65c867cb0145 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 5, 1999
 .Dt QUOTACTL 2
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2
index b581cac4cd1e..b8c451d91068 100644
--- a/lib/libc/sys/read.2
+++ b/lib/libc/sys/read.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)read.2	8.4 (Berkeley) 2/26/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 26, 1994
 .Dt READ 2
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index 8443de2170c7..b395dc10c036 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)readlink.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt READLINK 2
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index da99c33f60b4..a287a0f0e78d 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)reboot.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt REBOOT 2
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 67c653380ae3..538bfdb6955c 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 21, 1994
 .Dt RECV 2
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 9c5102655c5a..cce01d6e6a2d 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rename.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: rename.2,v 1.6 1997/02/22 15:04:16 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RENAME 2
diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2
index dd41fb39978d..cafdf89b35e7 100644
--- a/lib/libc/sys/revoke.2
+++ b/lib/libc/sys/revoke.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)revoke.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt REVOKE 2
diff --git a/lib/libc/sys/rfork.2 b/lib/libc/sys/rfork.2
index c781552bf503..c5825cb85082 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>.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd Jan 12, 1996
 .Dt RFORK 2
diff --git a/lib/libc/sys/rmdir.2 b/lib/libc/sys/rmdir.2
index 5aa4e1a7e348..d61828757b84 100644
--- a/lib/libc/sys/rmdir.2
+++ b/lib/libc/sys/rmdir.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rmdir.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RMDIR 2
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index 5f83c7738174..ddc204cb09c6 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.
 .\" 
-.\" $Id: rtprio.2,v 1.9 1997/03/21 20:57:20 mpp Exp $
+.\" $FreeBSD$
 .\"
 .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 6d11d00d9915..185f561de9cf 100644
--- a/lib/libc/sys/sched_get_priority_max.2
+++ b/lib/libc/sys/sched_get_priority_max.2
@@ -1,4 +1,4 @@
-.\"	$Id: sched_get_priority_max.2,v 1.1 1998/03/28 11:48:50 dufault Exp $
+.\" $FreeBSD$
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libc/sys/sched_setparam.2
index 629f81a5d158..b627e6991ea3 100644
--- a/lib/libc/sys/sched_setparam.2
+++ b/lib/libc/sys/sched_setparam.2
@@ -1,4 +1,4 @@
-.\"	$Id: sched_setparam.2,v 1.2 1998/06/04 21:05:45 steve Exp $
+.\" $FreeBSD$
 .\" 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 2a196c8a5e84..94d9f57686e8 100644
--- a/lib/libc/sys/sched_setscheduler.2
+++ b/lib/libc/sys/sched_setscheduler.2
@@ -1,4 +1,4 @@
-.\"	$Id: sched_setscheduler.2,v 1.1 1998/03/28 11:48:55 dufault Exp $
+.\" $FreeBSD$
 .\" 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 b4ea28c3a356..28ac9cc421e9 100644
--- a/lib/libc/sys/sched_yield.2
+++ b/lib/libc/sys/sched_yield.2
@@ -1,4 +1,4 @@
-.\"	$Id:$
+.\" $FreeBSD$
 .\" Copyright (c) 1998 HD Associates, Inc.
 .\" All rights reserved.
 .\"
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index d2943d2cfa47..938f0ec65df8 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)select.2	8.2 (Berkeley) 3/25/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 25, 1994
 .Dt SELECT 2
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 862f761172b8..1983f86c07d8 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.
 .\"
-.\" $Id: semctl.2,v 1.7 1997/03/18 23:57:17 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 12, 1995
 .Dt SEMCTL 2
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index 3d58fa4c8fcc..edb0c873c8c3 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.
 .\"
-.\" $Id: semget.2,v 1.5 1997/03/18 23:57:22 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 12, 1995
 .Dt SEMGET 2
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 06dfa3b9f5a7..abae921091f9 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.
 .\"
-.\" $Id: semop.2,v 1.5 1997/02/22 15:04:21 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 22, 1995
 .Dt SEMOP 2
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index bf7bd4a61375..8f74a9f1b41a 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\"	$Id: send.2,v 1.7 1997/02/22 15:04:22 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 15, 1995
 .Dt SEND 2
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index da52e6358a10..87b9bacdb9b7 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.
 .\"
-.\"	$Id: sendfile.2,v 1.3 1999/07/26 09:37:47 sheldonh Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 5, 1998
 .Dt SENDFILE 2
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
index f26e4b761caf..f11cbd567100 100644
--- a/lib/libc/sys/setgroups.2
+++ b/lib/libc/sys/setgroups.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setgroups.2	8.2 (Berkeley) 4/16/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt SETGROUPS 2
diff --git a/lib/libc/sys/setpgid.2 b/lib/libc/sys/setpgid.2
index 9e998026c66b..19af6f710673 100644
--- a/lib/libc/sys/setpgid.2
+++ b/lib/libc/sys/setpgid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setpgid.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SETPGID 2
diff --git a/lib/libc/sys/setregid.2 b/lib/libc/sys/setregid.2
index aa788a2845ed..1802e6e9cb63 100644
--- a/lib/libc/sys/setregid.2
+++ b/lib/libc/sys/setregid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setregid.2	8.2 (Berkeley) 4/16/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt SETREGID 2
diff --git a/lib/libc/sys/setreuid.2 b/lib/libc/sys/setreuid.2
index 57a6e1b0c21e..32d35eef557a 100644
--- a/lib/libc/sys/setreuid.2
+++ b/lib/libc/sys/setreuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setreuid.2	8.2 (Berkeley) 4/16/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt SETREUID 2
diff --git a/lib/libc/sys/setsid.2 b/lib/libc/sys/setsid.2
index cdf9d434666a..631cc130516f 100644
--- a/lib/libc/sys/setsid.2
+++ b/lib/libc/sys/setsid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)setsid.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SETSID 2
diff --git a/lib/libc/sys/setuid.2 b/lib/libc/sys/setuid.2
index 29651f3cd298..0fc68908a135 100644
--- a/lib/libc/sys/setuid.2
+++ b/lib/libc/sys/setuid.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: setuid.2,v 1.11 1997/04/02 17:24:16 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SETUID 2
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
index db2860e15f86..331a4c942186 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.
 .\"
-.\" $Id: shmat.2,v 1.6 1997/03/18 23:57:29 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 2, 1995
 .Dt SHMAT 2
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index cf8bac83dde3..e24d226ceaec 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.
 .\"
-.\" $Id: shmctl.2,v 1.7 1997/09/07 04:10:35 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 17, 1995
 .Dt SHMCTL 2
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index ad52fe78ef7d..db5917f6414c 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.
 .\"
-.\" $Id: shmget.2,v 1.6 1997/03/18 23:57:33 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 3, 1995
 .Dt SHMGET 2
diff --git a/lib/libc/sys/shutdown.2 b/lib/libc/sys/shutdown.2
index 758be8dc10e4..b35a55d34206 100644
--- a/lib/libc/sys/shutdown.2
+++ b/lib/libc/sys/shutdown.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shutdown.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SHUTDOWN 2
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 6679eabd6621..975af2f031cb 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sigaction.2	8.2 (Berkeley) 4/3/94
-.\"	$Id: sigaction.2,v 1.18 1998/06/04 21:05:49 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 3, 1994
 .Dt SIGACTION 2
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index 3094943f6d3c..d16612c0222a 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigaltstack.2	8.2 (Berkeley) 5/1/95
-.\"	$Id: sigaltstack.2,v 1.9 1999/01/01 12:22:11 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt SIGALTSTACK 2
diff --git a/lib/libc/sys/sigpending.2 b/lib/libc/sys/sigpending.2
index 091ef2ff205f..481bd1962e74 100644
--- a/lib/libc/sys/sigpending.2
+++ b/lib/libc/sys/sigpending.2
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigpending.2	8.3 (Berkeley) 1/12/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 12, 1994
 .Dt SIGPENDING 2
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index 9510e3c11c11..8f58f968519e 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigprocmask.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SIGPROCMASK 2
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libc/sys/sigreturn.2
index 395f9325d1e6..ffeec66d1fc0 100644
--- a/lib/libc/sys/sigreturn.2
+++ b/lib/libc/sys/sigreturn.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigreturn.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SIGRETURN 2
diff --git a/lib/libc/sys/sigstack.2 b/lib/libc/sys/sigstack.2
index f7570540f209..404fc3ede734 100644
--- a/lib/libc/sys/sigstack.2
+++ b/lib/libc/sys/sigstack.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sigstack.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SIGSTACK 2
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libc/sys/sigsuspend.2
index f420c6b9c239..c3e36ad69706 100644
--- a/lib/libc/sys/sigsuspend.2
+++ b/lib/libc/sys/sigsuspend.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigsuspend.2	8.2 (Berkeley) 5/16/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 16, 1995
 .Dt SIGSUSPEND 2
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 22e4b195c3d9..df988fff5ab7 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)socket.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: socket.2,v 1.8 1997/11/23 17:58:46 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 24, 1997
 .Dt SOCKET 2
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index 6c60886a743a..bf4e842e6ee0 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)socketpair.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SOCKETPAIR 2
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 024af9cedfaa..5617c36d167b 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
-.\"	$Id: stat.2,v 1.14 1998/10/21 09:48:35 dima Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt STAT 2
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index 613ae4a98e08..1990797a88de 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)statfs.2	8.5 (Berkeley) 5/24/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 24, 1995
 .Dt STATFS 2
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index 0fb20c5d8c73..0ab908c61cd3 100644
--- a/lib/libc/sys/swapon.2
+++ b/lib/libc/sys/swapon.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SWAPON 2
diff --git a/lib/libc/sys/symlink.2 b/lib/libc/sys/symlink.2
index cdb99f64c4b3..f88a309e1f8a 100644
--- a/lib/libc/sys/symlink.2
+++ b/lib/libc/sys/symlink.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)symlink.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SYMLINK 2
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
index 8607254dfae1..a989e8d57fca 100644
--- a/lib/libc/sys/sync.2
+++ b/lib/libc/sys/sync.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sync.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SYNC 2
diff --git a/lib/libc/sys/sysarch.2 b/lib/libc/sys/sysarch.2
index 607e437cb1b4..c3840e9f12ea 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 $
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .\" 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 724a46f05419..c5192fb02c0f 100644
--- a/lib/libc/sys/syscall.2
+++ b/lib/libc/sys/syscall.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syscall.2	8.1 (Berkeley) 6/16/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1993
 .Dt SYSCALL 2
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index 315a4d3a450b..ce17ff280379 100644
--- a/lib/libc/sys/truncate.2
+++ b/lib/libc/sys/truncate.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)truncate.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TRUNCATE 2
diff --git a/lib/libc/sys/umask.2 b/lib/libc/sys/umask.2
index 4ac1db818c9b..aaeaaa560dc4 100644
--- a/lib/libc/sys/umask.2
+++ b/lib/libc/sys/umask.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umask.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt UMASK 2
diff --git a/lib/libc/sys/undelete.2 b/lib/libc/sys/undelete.2
index 828ebaa26808..b95a3a613ecd 100644
--- a/lib/libc/sys/undelete.2
+++ b/lib/libc/sys/undelete.2
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)undelete.2	8.4 (Berkeley) 10/18/94
-.\"     $Id: undelete.2,v 1.2 1999/07/12 20:48:53 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 18, 1994
 .Dt UNDELETE 2
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index 8693f95b0067..874a001a2c2d 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt UNLINK 2
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index fcc90117ea95..ea04d853eae7 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt UTIMES 2
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index 2c97af94ca40..7363c55abec6 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vfork.2	8.1 (Berkeley) 6/4/93
-.\"	$Id: vfork.2,v 1.10 1998/01/02 19:22:49 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt VFORK 2
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index 98e487899f17..5cbd812700fc 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wait.2	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt WAIT 2
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index c2e442362f6a..ab5d236ed322 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)write.2	8.5 (Berkeley) 4/2/94
-.\"     $Id: write.2,v 1.9 1999/07/12 20:48:55 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 2, 1994
 .Dt WRITE 2
diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc
index 848d4a5b4208..1837ef889a38 100644
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
-#	$Id: Makefile.inc,v 1.8 1997/05/28 16:29:12 wpaul Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/.
 SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
diff --git a/lib/libc/xdr/xdr.3 b/lib/libc/xdr/xdr.3
index f64e5b1cdc9b..979b54e03a6e 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
-.\" $Id: xdr.3,v 1.3 1996/10/05 22:26:44 wosch Exp $
+.\" $FreeBSD$
 .\"
 .TH XDR 3 "16 February 1988"
 .SH NAME
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
index db99ce02b45b..956e2ffe983a 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr.c 1.35 87/08/12";*/
 /*static char *sccsid = "from: @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr.c,v 1.7 1997/05/28 04:57:30 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index f9c34ab5ce70..b7d36fea5ca3 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_array.c,v 1.4 1996/12/30 14:07:08 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index b8c8f6066302..0ffbeb3358bc 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_float.c,v 1.3 1996/12/30 14:07:08 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index 36b9ada866cf..3193e64939dd 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_mem.c,v 1.4 1996/12/30 14:07:09 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index b94b1ab0142a..b96b6342165c 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -29,7 +29,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_rec.c,v 1.9 1998/05/15 22:57:31 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
index 75607ba1587e..b0cdbce93008 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_reference.c 1.11 87/08/11 SMI";*/
 /*static char *sccsid = "from: @(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_reference.c,v 1.4 1996/12/30 14:07:11 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index 39eda500d1bb..708573ccdf58 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC";*/
-static char *rcsid = "$Id: xdr_stdio.c,v 1.3 1996/12/30 14:07:11 peter Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
index 7c7541dda753..2112aeb9b716 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
-#	$Id: Makefile.inc,v 1.6 1997/05/23 08:23:59 asami Exp $
+# $FreeBSD$
 
 # yp sources
 .PATH: ${.CURDIR}/../libc/yp
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index 9268fc2ded3a..180528866839 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef LINT
-static char *rcsid = "$Id$";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 #include <rpc/rpc.h>
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index c464b1c7db75..0622be1f8bbc 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef LINT
-static char *rcsid = "$Id: yplib.c,v 1.29 1997/04/10 20:26:04 wpaul Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif
 
 #include <sys/param.h>
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index eddc4ba3da66..3cc39fbd862d 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.17 1999/07/05 00:38:12 jasone Exp $
+# $FreeBSD$
 #
 # All library objects contain rcsid 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/alpha/_atomic_lock.S b/lib/libc_r/arch/alpha/_atomic_lock.S
index 4a21fdf1abc4..1cfb52faa824 100644
--- a/lib/libc_r/arch/alpha/_atomic_lock.S
+++ b/lib/libc_r/arch/alpha/_atomic_lock.S
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
  * SUCH DAMAGE.    
  *
- * $Id: _atomic_lock.S,v 1.1 1998/06/09 08:21:55 jb Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libc_r/arch/amd64/_atomic_lock.S b/lib/libc_r/arch/amd64/_atomic_lock.S
index e0ef0eb6244f..afaec7125ca1 100644
--- a/lib/libc_r/arch/amd64/_atomic_lock.S
+++ b/lib/libc_r/arch/amd64/_atomic_lock.S
@@ -19,13 +19,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
  * SUCH DAMAGE.    
  *
- * $Id: _atomic_lock.S,v 1.1 1998/04/29 09:36:03 jb Exp $
+ * $FreeBSD$
  *
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: _atomic_lock.S,v 1.1 1998/04/29 09:36:03 jb Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc_r/arch/i386/_atomic_lock.S b/lib/libc_r/arch/i386/_atomic_lock.S
index e0ef0eb6244f..afaec7125ca1 100644
--- a/lib/libc_r/arch/i386/_atomic_lock.S
+++ b/lib/libc_r/arch/i386/_atomic_lock.S
@@ -19,13 +19,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
  * SUCH DAMAGE.    
  *
- * $Id: _atomic_lock.S,v 1.1 1998/04/29 09:36:03 jb Exp $
+ * $FreeBSD$
  *
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: _atomic_lock.S,v 1.1 1998/04/29 09:36:03 jb Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libc_r/man/Makefile.inc b/lib/libc_r/man/Makefile.inc
index f92f3df5230e..68129f6139bc 100644
--- a/lib/libc_r/man/Makefile.inc
+++ b/lib/libc_r/man/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.4 1998/07/31 09:09:19 phk Exp $
+# $FreeBSD$
 
 # POSIX thread man files
 
diff --git a/lib/libc_r/man/pthread_cleanup_pop.3 b/lib/libc_r/man/pthread_cleanup_pop.3
index db0547c57736..faae8ba450fc 100644
--- a/lib/libc_r/man/pthread_cleanup_pop.3
+++ b/lib/libc_r/man/pthread_cleanup_pop.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_POP 3
diff --git a/lib/libc_r/man/pthread_cleanup_push.3 b/lib/libc_r/man/pthread_cleanup_push.3
index cf6682363647..4f260affbc32 100644
--- a/lib/libc_r/man/pthread_cleanup_push.3
+++ b/lib/libc_r/man/pthread_cleanup_push.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_PUSH 3
diff --git a/lib/libc_r/man/pthread_cond_broadcast.3 b/lib/libc_r/man/pthread_cond_broadcast.3
index dbaaa851a548..6112695c9893 100644
--- a/lib/libc_r/man/pthread_cond_broadcast.3
+++ b/lib/libc_r/man/pthread_cond_broadcast.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_BROADCAST 3
diff --git a/lib/libc_r/man/pthread_cond_destroy.3 b/lib/libc_r/man/pthread_cond_destroy.3
index 3efe8b61afa9..75ae99686f41 100644
--- a/lib/libc_r/man/pthread_cond_destroy.3
+++ b/lib/libc_r/man/pthread_cond_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_DESTROY 3
diff --git a/lib/libc_r/man/pthread_cond_init.3 b/lib/libc_r/man/pthread_cond_init.3
index 1a9415500dc8..2783672ce3d9 100644
--- a/lib/libc_r/man/pthread_cond_init.3
+++ b/lib/libc_r/man/pthread_cond_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_INIT 3
diff --git a/lib/libc_r/man/pthread_cond_signal.3 b/lib/libc_r/man/pthread_cond_signal.3
index 574862ec3104..e3a22f88cf6c 100644
--- a/lib/libc_r/man/pthread_cond_signal.3
+++ b/lib/libc_r/man/pthread_cond_signal.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_SIGNAL 3
diff --git a/lib/libc_r/man/pthread_cond_timedwait.3 b/lib/libc_r/man/pthread_cond_timedwait.3
index 6af8430dd2f2..de427f8d4c0a 100644
--- a/lib/libc_r/man/pthread_cond_timedwait.3
+++ b/lib/libc_r/man/pthread_cond_timedwait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: pthread_cond_timedwait.3,v 1.4 1999/07/12 20:49:03 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_TIMEDWAIT 3
diff --git a/lib/libc_r/man/pthread_cond_wait.3 b/lib/libc_r/man/pthread_cond_wait.3
index 9d6294f2715c..435cd41f2be6 100644
--- a/lib/libc_r/man/pthread_cond_wait.3
+++ b/lib/libc_r/man/pthread_cond_wait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: pthread_cond_wait.3,v 1.4 1999/07/12 20:49:05 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_WAIT 3
diff --git a/lib/libc_r/man/pthread_create.3 b/lib/libc_r/man/pthread_create.3
index 3342296db8d3..cdc28a56c854 100644
--- a/lib/libc_r/man/pthread_create.3
+++ b/lib/libc_r/man/pthread_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_CREATE 3
diff --git a/lib/libc_r/man/pthread_detach.3 b/lib/libc_r/man/pthread_detach.3
index 34797a25b643..a3fffc6056ea 100644
--- a/lib/libc_r/man/pthread_detach.3
+++ b/lib/libc_r/man/pthread_detach.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_DETACH 3
diff --git a/lib/libc_r/man/pthread_equal.3 b/lib/libc_r/man/pthread_equal.3
index cb158682c74e..5d443b3cb2c6 100644
--- a/lib/libc_r/man/pthread_equal.3
+++ b/lib/libc_r/man/pthread_equal.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EQUAL 3
diff --git a/lib/libc_r/man/pthread_exit.3 b/lib/libc_r/man/pthread_exit.3
index 4fbf4a64611a..ff452ca94215 100644
--- a/lib/libc_r/man/pthread_exit.3
+++ b/lib/libc_r/man/pthread_exit.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: pthread_exit.3,v 1.5 1999/07/12 20:49:07 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EXIT 3
diff --git a/lib/libc_r/man/pthread_getspecific.3 b/lib/libc_r/man/pthread_getspecific.3
index b7875fbdb846..a56254108f6e 100644
--- a/lib/libc_r/man/pthread_getspecific.3
+++ b/lib/libc_r/man/pthread_getspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_getspecific.3,v 1.4 1997/02/22 15:05:24 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_GETSPECIFIC 3
diff --git a/lib/libc_r/man/pthread_join.3 b/lib/libc_r/man/pthread_join.3
index d677aa10d915..e32ad40613b7 100644
--- a/lib/libc_r/man/pthread_join.3
+++ b/lib/libc_r/man/pthread_join.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_JOIN 3
diff --git a/lib/libc_r/man/pthread_key_create.3 b/lib/libc_r/man/pthread_key_create.3
index 6327b92eb315..76fc1879326c 100644
--- a/lib/libc_r/man/pthread_key_create.3
+++ b/lib/libc_r/man/pthread_key_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_CREATE 3
diff --git a/lib/libc_r/man/pthread_key_delete.3 b/lib/libc_r/man/pthread_key_delete.3
index 4328e29b5061..39fb19ea9af8 100644
--- a/lib/libc_r/man/pthread_key_delete.3
+++ b/lib/libc_r/man/pthread_key_delete.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_DELETE 3
diff --git a/lib/libc_r/man/pthread_mutex_destroy.3 b/lib/libc_r/man/pthread_mutex_destroy.3
index fa4fdc31d7e8..517d6ebadf5d 100644
--- a/lib/libc_r/man/pthread_mutex_destroy.3
+++ b/lib/libc_r/man/pthread_mutex_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_DESTROY 3
diff --git a/lib/libc_r/man/pthread_mutex_init.3 b/lib/libc_r/man/pthread_mutex_init.3
index 07c9e91852e1..926b034b6011 100644
--- a/lib/libc_r/man/pthread_mutex_init.3
+++ b/lib/libc_r/man/pthread_mutex_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_INIT 3
diff --git a/lib/libc_r/man/pthread_mutex_lock.3 b/lib/libc_r/man/pthread_mutex_lock.3
index 6e7901db7c23..36473733ce11 100644
--- a/lib/libc_r/man/pthread_mutex_lock.3
+++ b/lib/libc_r/man/pthread_mutex_lock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_LOCK 3
diff --git a/lib/libc_r/man/pthread_mutex_trylock.3 b/lib/libc_r/man/pthread_mutex_trylock.3
index 6fef180bb966..30faaa81bd4d 100644
--- a/lib/libc_r/man/pthread_mutex_trylock.3
+++ b/lib/libc_r/man/pthread_mutex_trylock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_TRYLOCK 3
diff --git a/lib/libc_r/man/pthread_mutex_unlock.3 b/lib/libc_r/man/pthread_mutex_unlock.3
index cebfbd50dc6d..27a4c337fe37 100644
--- a/lib/libc_r/man/pthread_mutex_unlock.3
+++ b/lib/libc_r/man/pthread_mutex_unlock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_UNLOCK 3
diff --git a/lib/libc_r/man/pthread_once.3 b/lib/libc_r/man/pthread_once.3
index 27130bcef349..2dcea493cb9c 100644
--- a/lib/libc_r/man/pthread_once.3
+++ b/lib/libc_r/man/pthread_once.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_ONCE 3
diff --git a/lib/libc_r/man/pthread_rwlock_destroy.3 b/lib/libc_r/man/pthread_rwlock_destroy.3
index b67a2e7beb0d..14691c44bbf8 100644
--- a/lib/libc_r/man/pthread_rwlock_destroy.3
+++ b/lib/libc_r/man/pthread_rwlock_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_rwlock_destroy.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_DESTROY 3
diff --git a/lib/libc_r/man/pthread_rwlock_init.3 b/lib/libc_r/man/pthread_rwlock_init.3
index a56169507b48..306af61bbeb4 100644
--- a/lib/libc_r/man/pthread_rwlock_init.3
+++ b/lib/libc_r/man/pthread_rwlock_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_INIT 3
diff --git a/lib/libc_r/man/pthread_rwlock_rdlock.3 b/lib/libc_r/man/pthread_rwlock_rdlock.3
index 9181be96cd5d..bea219de0100 100644
--- a/lib/libc_r/man/pthread_rwlock_rdlock.3
+++ b/lib/libc_r/man/pthread_rwlock_rdlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_RDLOCK 3
diff --git a/lib/libc_r/man/pthread_rwlock_unlock.3 b/lib/libc_r/man/pthread_rwlock_unlock.3
index 1c9fd05797ad..7ad52b257120 100644
--- a/lib/libc_r/man/pthread_rwlock_unlock.3
+++ b/lib/libc_r/man/pthread_rwlock_unlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_UNLOCK 3
diff --git a/lib/libc_r/man/pthread_rwlock_wrlock.3 b/lib/libc_r/man/pthread_rwlock_wrlock.3
index a5a367406566..b6a2312a79d6 100644
--- a/lib/libc_r/man/pthread_rwlock_wrlock.3
+++ b/lib/libc_r/man/pthread_rwlock_wrlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_WRLOCK 3
diff --git a/lib/libc_r/man/pthread_rwlockattr_destroy.3 b/lib/libc_r/man/pthread_rwlockattr_destroy.3
index 35ac21719e97..2d67041ba161 100644
--- a/lib/libc_r/man/pthread_rwlockattr_destroy.3
+++ b/lib/libc_r/man/pthread_rwlockattr_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_rwlockattr_destroy.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_DESTROY 3
diff --git a/lib/libc_r/man/pthread_rwlockattr_getpshared.3 b/lib/libc_r/man/pthread_rwlockattr_getpshared.3
index 4b8d9937104d..d2028dc58c6d 100644
--- a/lib/libc_r/man/pthread_rwlockattr_getpshared.3
+++ b/lib/libc_r/man/pthread_rwlockattr_getpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_rwlockattr_getpshared.3,v 1.2 1999/03/05 18:43:00 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 22, 1999
 .Dt PTHREAD_RWLOCKATTR_GETPSHARED 3
diff --git a/lib/libc_r/man/pthread_rwlockattr_init.3 b/lib/libc_r/man/pthread_rwlockattr_init.3
index 54bbedce2cab..ac191260c66d 100644
--- a/lib/libc_r/man/pthread_rwlockattr_init.3
+++ b/lib/libc_r/man/pthread_rwlockattr_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_rwlockattr_init.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_INIT 3
diff --git a/lib/libc_r/man/pthread_rwlockattr_setpshared.3 b/lib/libc_r/man/pthread_rwlockattr_setpshared.3
index e63debfc400b..b98e081aa3a7 100644
--- a/lib/libc_r/man/pthread_rwlockattr_setpshared.3
+++ b/lib/libc_r/man/pthread_rwlockattr_setpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3
diff --git a/lib/libc_r/man/pthread_self.3 b/lib/libc_r/man/pthread_self.3
index ef1d88d88b68..be524b9345b9 100644
--- a/lib/libc_r/man/pthread_self.3
+++ b/lib/libc_r/man/pthread_self.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SELF 3
diff --git a/lib/libc_r/man/pthread_setspecific.3 b/lib/libc_r/man/pthread_setspecific.3
index c8e2b1a529e8..89a416f57c61 100644
--- a/lib/libc_r/man/pthread_setspecific.3
+++ b/lib/libc_r/man/pthread_setspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SETSPECIFIC 3
diff --git a/lib/libc_r/sys/Makefile.inc b/lib/libc_r/sys/Makefile.inc
index 50952cdfad1a..e608afa69909 100644
--- a/lib/libc_r/sys/Makefile.inc
+++ b/lib/libc_r/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.8 1998/04/29 11:03:34 jb Exp $
+# $FreeBSD$
 
 .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 9f9e1a514cd8..0d08ae83729a 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libc_r/test/Makefile b/lib/libc_r/test/Makefile
index c39497945f06..90ee5ad59ea4 100644
--- a/lib/libc_r/test/Makefile
+++ b/lib/libc_r/test/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/09/30 07:07:59 jb Exp $
+# $FreeBSD$
 #
 # Tests for libc_r functionality.
 #
diff --git a/lib/libc_r/test/mutex/Makefile b/lib/libc_r/test/mutex/Makefile
index 334d2a7a86ae..19f4ce34622d 100644
--- a/lib/libc_r/test/mutex/Makefile
+++ b/lib/libc_r/test/mutex/Makefile
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 
 PROG=		mutex
 SRCS=		mutex.c
diff --git a/lib/libc_r/test/mutex/mutex.c b/lib/libc_r/test/mutex/mutex.c
index fffed0a65aa6..02689d307601 100644
--- a/lib/libc_r/test/mutex/mutex.c
+++ b/lib/libc_r/test/mutex/mutex.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/test/sigsuspend/Makefile b/lib/libc_r/test/sigsuspend/Makefile
index 59ea321c5777..7fb52c8f43b2 100644
--- a/lib/libc_r/test/sigsuspend/Makefile
+++ b/lib/libc_r/test/sigsuspend/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/08/25 12:35:16 jb Exp $
+# $FreeBSD$
 
 PROG=		sigsuspend
 SRCS=		sigsuspend.c
diff --git a/lib/libc_r/test/sigsuspend/sigsuspend.c b/lib/libc_r/test/sigsuspend/sigsuspend.c
index 2f5075d4e25f..7921e8aa1fbb 100644
--- a/lib/libc_r/test/sigsuspend/sigsuspend.c
+++ b/lib/libc_r/test/sigsuspend/sigsuspend.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/test/sigwait/Makefile b/lib/libc_r/test/sigwait/Makefile
index fbd9233dff1b..31520c1af0fb 100644
--- a/lib/libc_r/test/sigwait/Makefile
+++ b/lib/libc_r/test/sigwait/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=		sigwait
 SRCS=		sigwait.c
diff --git a/lib/libc_r/test/sigwait/sigwait.c b/lib/libc_r/test/sigwait/sigwait.c
index 54c00b548bc3..4fcaa4ff6673 100644
--- a/lib/libc_r/test/sigwait/sigwait.c
+++ b/lib/libc_r/test/sigwait/sigwait.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc
index 22e954861e03..d42c04b1c871 100644
--- a/lib/libc_r/uthread/Makefile.inc
+++ b/lib/libc_r/uthread/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.17 1999/03/23 05:07:54 jb Exp $
+# $FreeBSD$
 
 # uthread sources
 .PATH: ${.CURDIR}/uthread
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h
index 65203d5c8fad..c6c1100522c0 100644
--- a/lib/libc_r/uthread/pthread_private.h
+++ b/lib/libc_r/uthread/pthread_private.h
@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $Id: pthread_private.h,v 1.24 1999/07/12 16:09:30 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PTHREAD_PRIVATE_H
diff --git a/lib/libc_r/uthread/uthread_accept.c b/lib/libc_r/uthread/uthread_accept.c
index f8f8d88ebbbc..a6015c2c0832 100644
--- a/lib/libc_r/uthread/uthread_accept.c
+++ b/lib/libc_r/uthread/uthread_accept.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_attr_destroy.c b/lib/libc_r/uthread/uthread_attr_destroy.c
index e972d5f24813..dfe668ea2181 100644
--- a/lib/libc_r/uthread/uthread_attr_destroy.c
+++ b/lib/libc_r/uthread/uthread_attr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_attr_getdetachstate.c b/lib/libc_r/uthread/uthread_attr_getdetachstate.c
index 8a986b3c8977..fee1e8b11a2a 100644
--- a/lib/libc_r/uthread/uthread_attr_getdetachstate.c
+++ b/lib/libc_r/uthread/uthread_attr_getdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_getinheritsched.c b/lib/libc_r/uthread/uthread_attr_getinheritsched.c
index 5cf5b63cb724..f98fde7fac83 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_getschedparam.c b/lib/libc_r/uthread/uthread_attr_getschedparam.c
index bac609fda8ca..61c68913de2f 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_getschedpolicy.c b/lib/libc_r/uthread/uthread_attr_getschedpolicy.c
index 5248780c5d01..6ebc76492653 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_getscope.c b/lib/libc_r/uthread/uthread_attr_getscope.c
index e62cc4182d72..f456585af966 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_getstackaddr.c b/lib/libc_r/uthread/uthread_attr_getstackaddr.c
index 78f0d429e577..1fee4a5f8717 100644
--- a/lib/libc_r/uthread/uthread_attr_getstackaddr.c
+++ b/lib/libc_r/uthread/uthread_attr_getstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_getstacksize.c b/lib/libc_r/uthread/uthread_attr_getstacksize.c
index a5989b53ec4d..5c7a9e071359 100644
--- a/lib/libc_r/uthread/uthread_attr_getstacksize.c
+++ b/lib/libc_r/uthread/uthread_attr_getstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_init.c b/lib/libc_r/uthread/uthread_attr_init.c
index 6233d737324c..dbe3091b0ab2 100644
--- a/lib/libc_r/uthread/uthread_attr_init.c
+++ b/lib/libc_r/uthread/uthread_attr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 311ff27d2e63..d230397f743f 100644
--- a/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c
+++ b/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_setdetachstate.c b/lib/libc_r/uthread/uthread_attr_setdetachstate.c
index f0c58ecccbd8..36a846a34abf 100644
--- a/lib/libc_r/uthread/uthread_attr_setdetachstate.c
+++ b/lib/libc_r/uthread/uthread_attr_setdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_setinheritsched.c b/lib/libc_r/uthread/uthread_attr_setinheritsched.c
index 06335235caa7..eb2384b8fc2b 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_setprio.c b/lib/libc_r/uthread/uthread_attr_setprio.c
index 50549c51e777..4bd6b6699874 100644
--- a/lib/libc_r/uthread/uthread_attr_setprio.c
+++ b/lib/libc_r/uthread/uthread_attr_setprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_setschedparam.c b/lib/libc_r/uthread/uthread_attr_setschedparam.c
index 0846c651008d..17b93b4ec523 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_setschedpolicy.c b/lib/libc_r/uthread/uthread_attr_setschedpolicy.c
index 36fac6f45342..640cb38f0b06 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_setscope.c b/lib/libc_r/uthread/uthread_attr_setscope.c
index 70ac8bb7d193..84239d7f6613 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_setstackaddr.c b/lib/libc_r/uthread/uthread_attr_setstackaddr.c
index 58686ca32266..7eb8c5d1319c 100644
--- a/lib/libc_r/uthread/uthread_attr_setstackaddr.c
+++ b/lib/libc_r/uthread/uthread_attr_setstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_attr_setstacksize.c b/lib/libc_r/uthread/uthread_attr_setstacksize.c
index cf306d27c795..2a2d85482e0a 100644
--- a/lib/libc_r/uthread/uthread_attr_setstacksize.c
+++ b/lib/libc_r/uthread/uthread_attr_setstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_bind.c b/lib/libc_r/uthread/uthread_bind.c
index 5f44677316ab..20ca7723b372 100644
--- a/lib/libc_r/uthread/uthread_bind.c
+++ b/lib/libc_r/uthread/uthread_bind.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_clean.c b/lib/libc_r/uthread/uthread_clean.c
index 496858b75942..bba5500c8fe7 100644
--- a/lib/libc_r/uthread/uthread_clean.c
+++ b/lib/libc_r/uthread/uthread_clean.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 6799832ee488..9eba4332f060 100644
--- a/lib/libc_r/uthread/uthread_close.c
+++ b/lib/libc_r/uthread/uthread_close.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_close.c,v 1.5 1999/06/20 08:28:11 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc_r/uthread/uthread_cond.c b/lib/libc_r/uthread/uthread_cond.c
index 4d52c631dcdc..079a635f8de5 100644
--- a/lib/libc_r/uthread/uthread_cond.c
+++ b/lib/libc_r/uthread/uthread_cond.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_cond.c,v 1.15 1999/06/20 08:28:13 jb Exp $
+ * $FreeBSD$
  */
 #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 2ea3ce75d5f0..ad91228c3050 100644
--- a/lib/libc_r/uthread/uthread_condattr_destroy.c
+++ b/lib/libc_r/uthread/uthread_condattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 9d9b610cb967..33798982f330 100644
--- a/lib/libc_r/uthread/uthread_condattr_init.c
+++ b/lib/libc_r/uthread/uthread_condattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 7b113390e3ae..67c706afc8c8 100644
--- a/lib/libc_r/uthread/uthread_connect.c
+++ b/lib/libc_r/uthread/uthread_connect.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_create.c b/lib/libc_r/uthread/uthread_create.c
index 25cf2b0640fb..b3ea39124a7c 100644
--- a/lib/libc_r/uthread/uthread_create.c
+++ b/lib/libc_r/uthread/uthread_create.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_create.c,v 1.17 1999/07/11 06:06:52 jasone Exp $
+ * $FreeBSD$
  */
 #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 7f24abb8ff18..164c7dfe54e1 100644
--- a/lib/libc_r/uthread/uthread_detach.c
+++ b/lib/libc_r/uthread/uthread_detach.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_detach.c,v 1.8 1999/06/20 08:28:15 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_dup.c b/lib/libc_r/uthread/uthread_dup.c
index 13c66222af1c..e32751a73dc0 100644
--- a/lib/libc_r/uthread/uthread_dup.c
+++ b/lib/libc_r/uthread/uthread_dup.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <unistd.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_dup2.c b/lib/libc_r/uthread/uthread_dup2.c
index ca40aae9b361..2c9e9de6705b 100644
--- a/lib/libc_r/uthread/uthread_dup2.c
+++ b/lib/libc_r/uthread/uthread_dup2.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 690a55aa4e45..e03ba4afe445 100644
--- a/lib/libc_r/uthread/uthread_equal.c
+++ b/lib/libc_r/uthread/uthread_equal.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_execve.c b/lib/libc_r/uthread/uthread_execve.c
index 17c823b0a9e6..32b9e2ebdeb7 100644
--- a/lib/libc_r/uthread/uthread_execve.c
+++ b/lib/libc_r/uthread/uthread_execve.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_execve.c,v 1.6 1999/06/20 08:28:17 jb Exp $
+ * $FreeBSD$
  */
 #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 6ff4f334beac..c9894435748d 100644
--- a/lib/libc_r/uthread/uthread_exit.c
+++ b/lib/libc_r/uthread/uthread_exit.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_exit.c,v 1.9 1999/06/20 08:28:17 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libc_r/uthread/uthread_fchmod.c b/lib/libc_r/uthread/uthread_fchmod.c
index a224cf3b1828..536c4b86d275 100644
--- a/lib/libc_r/uthread/uthread_fchmod.c
+++ b/lib/libc_r/uthread/uthread_fchmod.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 1b5aa8a2888b..185fb257bc80 100644
--- a/lib/libc_r/uthread/uthread_fchown.c
+++ b/lib/libc_r/uthread/uthread_fchown.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 485ed4374c7d..9a6293c5e3c8 100644
--- a/lib/libc_r/uthread/uthread_fcntl.c
+++ b/lib/libc_r/uthread/uthread_fcntl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 6040a7b17643..76069bf702ca 100644
--- a/lib/libc_r/uthread/uthread_fd.c
+++ b/lib/libc_r/uthread/uthread_fd.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_fd.c,v 1.11 1999/06/20 08:28:18 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_file.c b/lib/libc_r/uthread/uthread_file.c
index bdd4e689a146..709c8f6b71f2 100644
--- a/lib/libc_r/uthread/uthread_file.c
+++ b/lib/libc_r/uthread/uthread_file.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_file.c,v 1.7 1999/06/20 08:28:20 jb Exp $
+ * $FreeBSD$
  *
  * 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 6fc94457f2a5..d4a3bbd1162d 100644
--- a/lib/libc_r/uthread/uthread_find_thread.c
+++ b/lib/libc_r/uthread/uthread_find_thread.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_find_thread.c,v 1.3 1999/06/20 08:28:22 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_flock.c b/lib/libc_r/uthread/uthread_flock.c
index 36353924a30d..901ab9d0740c 100644
--- a/lib/libc_r/uthread/uthread_flock.c
+++ b/lib/libc_r/uthread/uthread_flock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <sys/file.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_fork.c b/lib/libc_r/uthread/uthread_fork.c
index f2e352c210dd..93d4a6869e5d 100644
--- a/lib/libc_r/uthread/uthread_fork.c
+++ b/lib/libc_r/uthread/uthread_fork.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_fork.c,v 1.11 1999/08/05 12:15:11 deischen Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libc_r/uthread/uthread_fstat.c b/lib/libc_r/uthread/uthread_fstat.c
index c61380b96a32..8e9e7a4bdcec 100644
--- a/lib/libc_r/uthread/uthread_fstat.c
+++ b/lib/libc_r/uthread/uthread_fstat.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 4e7c39dbac1b..d7a8a21863b9 100644
--- a/lib/libc_r/uthread/uthread_fstatfs.c
+++ b/lib/libc_r/uthread/uthread_fstatfs.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 93de8c8e98a3..3287edda8274 100644
--- a/lib/libc_r/uthread/uthread_fsync.c
+++ b/lib/libc_r/uthread/uthread_fsync.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <unistd.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_gc.c b/lib/libc_r/uthread/uthread_gc.c
index f2f216b7798f..d748049a5158 100644
--- a/lib/libc_r/uthread/uthread_gc.c
+++ b/lib/libc_r/uthread/uthread_gc.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: uthread_gc.c,v 1.8 1999/07/11 06:06:52 jasone Exp $
+ * $FreeBSD$
  *
  * 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 11368766e263..e3c5c7637122 100644
--- a/lib/libc_r/uthread/uthread_getdirentries.c
+++ b/lib/libc_r/uthread/uthread_getdirentries.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 66b99b323327..e05888f00acb 100644
--- a/lib/libc_r/uthread/uthread_getpeername.c
+++ b/lib/libc_r/uthread/uthread_getpeername.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 0ec97061d9ef..2f94b86b64af 100644
--- a/lib/libc_r/uthread/uthread_getprio.c
+++ b/lib/libc_r/uthread/uthread_getprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_getschedparam.c b/lib/libc_r/uthread/uthread_getschedparam.c
index 7642f5812908..b6c0c35c7bb6 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_getsockname.c b/lib/libc_r/uthread/uthread_getsockname.c
index 34fa8132de18..399dcbd68d62 100644
--- a/lib/libc_r/uthread/uthread_getsockname.c
+++ b/lib/libc_r/uthread/uthread_getsockname.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 c8610386a210..f4cedb86a875 100644
--- a/lib/libc_r/uthread/uthread_getsockopt.c
+++ b/lib/libc_r/uthread/uthread_getsockopt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 d005bab50a80..ed4a58db4647 100644
--- a/lib/libc_r/uthread/uthread_info.c
+++ b/lib/libc_r/uthread/uthread_info.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_info.c,v 1.11 1999/06/20 08:28:26 jb Exp $
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_init.c b/lib/libc_r/uthread/uthread_init.c
index c80427a73420..a2ce49331899 100644
--- a/lib/libc_r/uthread/uthread_init.c
+++ b/lib/libc_r/uthread/uthread_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_init.c,v 1.16 1999/07/12 16:09:30 dt Exp $
+ * $FreeBSD$
  */
 
 /* 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 d0e60557bd9e..f2c4531a2a70 100644
--- a/lib/libc_r/uthread/uthread_ioctl.c
+++ b/lib/libc_r/uthread/uthread_ioctl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdarg.h>
 #include <sys/ioctl.h>
diff --git a/lib/libc_r/uthread/uthread_join.c b/lib/libc_r/uthread/uthread_join.c
index e3d6c483669c..8b000825b207 100644
--- a/lib/libc_r/uthread/uthread_join.c
+++ b/lib/libc_r/uthread/uthread_join.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_join.c,v 1.7 1999/06/20 08:28:29 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_kern.c b/lib/libc_r/uthread/uthread_kern.c
index c0e4a5de212c..3331a5df0bc7 100644
--- a/lib/libc_r/uthread/uthread_kern.c
+++ b/lib/libc_r/uthread/uthread_kern.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_kern.c,v 1.20 1999/08/12 19:34:39 deischen Exp $
+ * $FreeBSD$
  *
  */
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_kill.c b/lib/libc_r/uthread/uthread_kill.c
index fd43a10536a6..6b25550330a9 100644
--- a/lib/libc_r/uthread/uthread_kill.c
+++ b/lib/libc_r/uthread/uthread_kill.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_kill.c,v 1.7 1999/06/20 08:28:32 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libc_r/uthread/uthread_listen.c b/lib/libc_r/uthread/uthread_listen.c
index 0e8a9c97d607..dc901072243c 100644
--- a/lib/libc_r/uthread/uthread_listen.c
+++ b/lib/libc_r/uthread/uthread_listen.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/libc_r/uthread/uthread_mattr_init.c b/lib/libc_r/uthread/uthread_mattr_init.c
index c65c87ab70a5..63d4401f2553 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 5a1dcd81c74c..8b3b8cbafaf5 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_multi_np.c b/lib/libc_r/uthread/uthread_multi_np.c
index 421d2a4252fe..39dd948cbc4f 100644
--- a/lib/libc_r/uthread/uthread_multi_np.c
+++ b/lib/libc_r/uthread/uthread_multi_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_mutex.c b/lib/libc_r/uthread/uthread_mutex.c
index c967b4698154..a402d4bc2159 100644
--- a/lib/libc_r/uthread/uthread_mutex.c
+++ b/lib/libc_r/uthread/uthread_mutex.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 5effb8ad495d..c193c82a9c80 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 7b86e5bb0756..9847ae529eb8 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 376f538440b7..9afebad917d2 100644
--- a/lib/libc_r/uthread/uthread_mutexattr_destroy.c
+++ b/lib/libc_r/uthread/uthread_mutexattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 41488ffae554..a922040d2faf 100644
--- a/lib/libc_r/uthread/uthread_nanosleep.c
+++ b/lib/libc_r/uthread/uthread_nanosleep.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_nanosleep.c,v 1.8 1999/08/19 23:06:10 alfred Exp $
+ * $FreeBSD$
  */
 #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 3f99778e21a7..ea56d82c4d83 100644
--- a/lib/libc_r/uthread/uthread_once.c
+++ b/lib/libc_r/uthread/uthread_once.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_open.c b/lib/libc_r/uthread/uthread_open.c
index 766bc283b50e..2f30ae727c53 100644
--- a/lib/libc_r/uthread/uthread_open.c
+++ b/lib/libc_r/uthread/uthread_open.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_open.c,v 1.4 1998/04/29 09:59:07 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <stdarg.h>
diff --git a/lib/libc_r/uthread/uthread_pipe.c b/lib/libc_r/uthread/uthread_pipe.c
index a113ddf674a9..72ed6c9f095a 100644
--- a/lib/libc_r/uthread/uthread_pipe.c
+++ b/lib/libc_r/uthread/uthread_pipe.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 2acd725dea5f..4967e6c78afd 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.
  *
- * $Id: uthread_poll.c,v 1.1 1999/06/20 08:28:36 jb Exp $
+ * $FreeBSD$
  */
 #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 0a00a9d3dc50..5bd8a8cc2826 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/lib/libc_r/uthread/uthread_read.c b/lib/libc_r/uthread/uthread_read.c
index b2da6559f919..0376827b1c59 100644
--- a/lib/libc_r/uthread/uthread_read.c
+++ b/lib/libc_r/uthread/uthread_read.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_read.c,v 1.6 1998/06/10 22:28:43 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_readv.c b/lib/libc_r/uthread/uthread_readv.c
index cbf5b451c6a7..a1a862d42490 100644
--- a/lib/libc_r/uthread/uthread_readv.c
+++ b/lib/libc_r/uthread/uthread_readv.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_readv.c,v 1.6 1998/06/10 22:28:44 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_recvfrom.c b/lib/libc_r/uthread/uthread_recvfrom.c
index 176149a5bc92..acc9f7be7878 100644
--- a/lib/libc_r/uthread/uthread_recvfrom.c
+++ b/lib/libc_r/uthread/uthread_recvfrom.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 136c7ead2dc1..dff8941eb401 100644
--- a/lib/libc_r/uthread/uthread_recvmsg.c
+++ b/lib/libc_r/uthread/uthread_recvmsg.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 e83dcc76d3bf..98ec7186d8f9 100644
--- a/lib/libc_r/uthread/uthread_resume_np.c
+++ b/lib/libc_r/uthread/uthread_resume_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_resume_np.c,v 1.5 1999/06/20 08:28:40 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_rwlock.c b/lib/libc_r/uthread/uthread_rwlock.c
index f398a1857d4a..648e8a394eeb 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.
  *
- *	$Id: uthread_rwlock.c,v 1.2 1998/09/07 19:23:55 alex Exp $
+ * $FreeBSD$
  */
 
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_rwlockattr.c b/lib/libc_r/uthread/uthread_rwlockattr.c
index 50b128b92807..3330ba19ff3e 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.
  *
- *	$Id: uthread_rwlockattr.c,v 1.1 1998/09/07 19:01:43 alex Exp $
+ * $FreeBSD$
  */
 
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_select.c b/lib/libc_r/uthread/uthread_select.c
index 217916003f7f..a7ea8cfabcd7 100644
--- a/lib/libc_r/uthread/uthread_select.c
+++ b/lib/libc_r/uthread/uthread_select.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_select.c,v 1.10 1999/08/19 23:06:11 alfred Exp $
+ * $FreeBSD$
  */
 #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 e6e11e446731..81ec427a3f04 100644
--- a/lib/libc_r/uthread/uthread_self.c
+++ b/lib/libc_r/uthread/uthread_self.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_sendmsg.c b/lib/libc_r/uthread/uthread_sendmsg.c
index 8e50fead9472..6834104a15dd 100644
--- a/lib/libc_r/uthread/uthread_sendmsg.c
+++ b/lib/libc_r/uthread/uthread_sendmsg.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 17c4d27f6fb8..a001ab7a99ea 100644
--- a/lib/libc_r/uthread/uthread_sendto.c
+++ b/lib/libc_r/uthread/uthread_sendto.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 445d2600a1a6..1934aac7222a 100644
--- a/lib/libc_r/uthread/uthread_seterrno.c
+++ b/lib/libc_r/uthread/uthread_seterrno.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_setprio.c b/lib/libc_r/uthread/uthread_setprio.c
index 3ef2df0eb1ae..5f7b44ad31e5 100644
--- a/lib/libc_r/uthread/uthread_setprio.c
+++ b/lib/libc_r/uthread/uthread_setprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_setschedparam.c b/lib/libc_r/uthread/uthread_setschedparam.c
index 1ba0e207275e..bb66fe50ba67 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 ddecd483c311..c38c61ff3f04 100644
--- a/lib/libc_r/uthread/uthread_setsockopt.c
+++ b/lib/libc_r/uthread/uthread_setsockopt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 c2b83143d28a..ccb087de81fd 100644
--- a/lib/libc_r/uthread/uthread_shutdown.c
+++ b/lib/libc_r/uthread/uthread_shutdown.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 17a3a959cf27..b6aad9ce7e67 100644
--- a/lib/libc_r/uthread/uthread_sig.c
+++ b/lib/libc_r/uthread/uthread_sig.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sig.c,v 1.17 1999/06/20 08:28:44 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <fcntl.h>
diff --git a/lib/libc_r/uthread/uthread_sigaction.c b/lib/libc_r/uthread/uthread_sigaction.c
index c5640d73cd66..7fa8ebff330d 100644
--- a/lib/libc_r/uthread/uthread_sigaction.c
+++ b/lib/libc_r/uthread/uthread_sigaction.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sigaction.c,v 1.6 1999/06/20 08:28:46 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_sigblock.c b/lib/libc_r/uthread/uthread_sigblock.c
index 2117ed73027d..986379ba7565 100644
--- a/lib/libc_r/uthread/uthread_sigblock.c
+++ b/lib/libc_r/uthread/uthread_sigblock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_sigmask.c b/lib/libc_r/uthread/uthread_sigmask.c
index 037ae1cb3d88..514f8fa750e5 100644
--- a/lib/libc_r/uthread/uthread_sigmask.c
+++ b/lib/libc_r/uthread/uthread_sigmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libc_r/uthread/uthread_signal.c b/lib/libc_r/uthread/uthread_signal.c
index 1ad26c06ad42..2b8f46a747d7 100644
--- a/lib/libc_r/uthread/uthread_signal.c
+++ b/lib/libc_r/uthread/uthread_signal.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_sigpending.c b/lib/libc_r/uthread/uthread_sigpending.c
index 28305d3f1b01..2d61e2104788 100644
--- a/lib/libc_r/uthread/uthread_sigpending.c
+++ b/lib/libc_r/uthread/uthread_sigpending.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_sigprocmask.c b/lib/libc_r/uthread/uthread_sigprocmask.c
index a80d8f9bdbd2..945592202fb4 100644
--- a/lib/libc_r/uthread/uthread_sigprocmask.c
+++ b/lib/libc_r/uthread/uthread_sigprocmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_sigsetmask.c b/lib/libc_r/uthread/uthread_sigsetmask.c
index 4980a7cf53a7..b02196ba0f2a 100644
--- a/lib/libc_r/uthread/uthread_sigsetmask.c
+++ b/lib/libc_r/uthread/uthread_sigsetmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_sigsuspend.c b/lib/libc_r/uthread/uthread_sigsuspend.c
index bbf7380f7f68..ac06ff71ba46 100644
--- a/lib/libc_r/uthread/uthread_sigsuspend.c
+++ b/lib/libc_r/uthread/uthread_sigsuspend.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_sigwait.c b/lib/libc_r/uthread/uthread_sigwait.c
index e044a6468f5a..7257b7e794cc 100644
--- a/lib/libc_r/uthread/uthread_sigwait.c
+++ b/lib/libc_r/uthread/uthread_sigwait.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sigwait.c,v 1.6 1999/06/20 08:28:47 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libc_r/uthread/uthread_single_np.c b/lib/libc_r/uthread/uthread_single_np.c
index 12674d2cbca6..d6ecb48b4259 100644
--- a/lib/libc_r/uthread/uthread_single_np.c
+++ b/lib/libc_r/uthread/uthread_single_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_socket.c b/lib/libc_r/uthread/uthread_socket.c
index c6521e3103e7..5772bc835eee 100644
--- a/lib/libc_r/uthread/uthread_socket.c
+++ b/lib/libc_r/uthread/uthread_socket.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 2b0a6c5d40fb..8c218019ccd0 100644
--- a/lib/libc_r/uthread/uthread_socketpair.c
+++ b/lib/libc_r/uthread/uthread_socketpair.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_socketpair.c,v 1.4 1998/04/29 09:59:27 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_spec.c b/lib/libc_r/uthread/uthread_spec.c
index d54bd892f116..f1e9f5c08a9b 100644
--- a/lib/libc_r/uthread/uthread_spec.c
+++ b/lib/libc_r/uthread/uthread_spec.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 d84cf3143b20..4e94ffcb3e0f 100644
--- a/lib/libc_r/uthread/uthread_spinlock.c
+++ b/lib/libc_r/uthread/uthread_spinlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_spinlock.c,v 1.5 1999/03/23 05:07:56 jb Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libc_r/uthread/uthread_suspend_np.c b/lib/libc_r/uthread/uthread_suspend_np.c
index b83057d2ad92..ea9b1f857af5 100644
--- a/lib/libc_r/uthread/uthread_suspend_np.c
+++ b/lib/libc_r/uthread/uthread_suspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_suspend_np.c,v 1.5 1999/06/20 08:28:48 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_switch_np.c b/lib/libc_r/uthread/uthread_switch_np.c
index 8e5721e5a036..9b83545fdd7e 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libc_r/uthread/uthread_wait4.c b/lib/libc_r/uthread/uthread_wait4.c
index 64394f8978a9..fc6cfba69f1e 100644
--- a/lib/libc_r/uthread/uthread_wait4.c
+++ b/lib/libc_r/uthread/uthread_wait4.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <sys/wait.h>
diff --git a/lib/libc_r/uthread/uthread_write.c b/lib/libc_r/uthread/uthread_write.c
index f94623b633ae..9292add9027e 100644
--- a/lib/libc_r/uthread/uthread_write.c
+++ b/lib/libc_r/uthread/uthread_write.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_write.c,v 1.10 1998/09/07 21:55:01 alex Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_writev.c b/lib/libc_r/uthread/uthread_writev.c
index aad77fea19e6..8ca5db7d8264 100644
--- a/lib/libc_r/uthread/uthread_writev.c
+++ b/lib/libc_r/uthread/uthread_writev.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_writev.c,v 1.10 1998/06/14 09:36:14 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libc_r/uthread/uthread_yield.c b/lib/libc_r/uthread/uthread_yield.c
index 7b388427c2f8..064dd826d34c 100644
--- a/lib/libc_r/uthread/uthread_yield.c
+++ b/lib/libc_r/uthread/uthread_yield.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile
index 5e2a34548fdc..4ecd11ac2622 100644
--- a/lib/libcalendar/Makefile
+++ b/lib/libcalendar/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/12/04 10:41:49 helbig Exp $
+# $FreeBSD$
 
 LIB=	calendar
 
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index a2eaf5c7cf75..ba889bfd6766 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.
 .\"
-.\"	$Id: calendar.3,v 1.3 1997/12/13 11:51:10 helbig Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 29, 1997
 .Dt CALENDAR 3
diff --git a/lib/libcalendar/calendar.c b/lib/libcalendar/calendar.c
index ae36a4c87aef..3f5ca0700c93 100644
--- a/lib/libcalendar/calendar.c
+++ b/lib/libcalendar/calendar.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: calendar.c,v 1.1.1.1 1997/12/04 10:41:49 helbig Exp $
+ * $FreeBSD$
  */
 
 #include "calendar.h"
diff --git a/lib/libcalendar/calendar.h b/lib/libcalendar/calendar.h
index 2e432ed47cec..2c42d6c2214e 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.
  *
- *	$Id: calendar.h,v 1.2 1997/12/07 19:04:11 helbig Exp $
+ * $FreeBSD$
  */
 struct date {
 	int y;	/* year */
diff --git a/lib/libcalendar/easter.c b/lib/libcalendar/easter.c
index 573f06d8b4d7..333665b9390c 100644
--- a/lib/libcalendar/easter.c
+++ b/lib/libcalendar/easter.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: easter.c,v 1.2 1997/12/07 19:04:14 helbig Exp $
+ * $FreeBSD$
  */
 
 #include "calendar.h"
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index 1a6979ae491e..8cd898c74da7 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.
 .\"
-.\"	$Id: cam.3,v 1.3 1999/08/15 09:51:23 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 10, 1998
 .Os FreeBSD 3.0
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index 553cddd59704..42c5dac44225 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.
 .\"
-.\"	$Id: cam_cdbparse.3,v 1.1 1998/10/14 06:20:36 ken Exp $
+.\" $FreeBSD$
 .\"
 .\" 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 8fecaaba0ba3..5f2152dab833 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: camlib.c,v 1.4 1998/11/15 23:17:39 ken Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index 9a7535c05de5..420129431b0c 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.
  *
- *	$Id$
+ * $FreeBSD$
  */
 /*
  * 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 bcc82c3837ae..ad1cbb0e93e9 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * From: scsi.c,v 1.8 1997/02/22 15:07:54 peter Exp $
- * $Id: scsi_cmdparse.c,v 1.1 1998/09/15 06:16:46 gibbs Exp $
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 31128320b3f4..85df262de725 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 LIB=	com_err
 SRCS=	com_err.c error_message.c et_name.c init_et.c
diff --git a/lib/libcom_err/com_err.c b/lib/libcom_err/com_err.c
index 9da3f9a74407..04000e369511 100644
--- a/lib/libcom_err/com_err.c
+++ b/lib/libcom_err/com_err.c
@@ -15,7 +15,7 @@
 
 #if ! lint
 static const char rcsid[] =
-    "$Id$";
+  "$FreeBSD$";
 #endif	/* ! lint */
 
 static void
diff --git a/lib/libcom_err/doc/Makefile b/lib/libcom_err/doc/Makefile
index e94d86296dd0..4c3c0bb0c744 100644
--- a/lib/libcom_err/doc/Makefile
+++ b/lib/libcom_err/doc/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 INFO=	com_err
 INFOSECTION= "Programming & development tools."
diff --git a/lib/libcompat/4.1/ascftime.c b/lib/libcompat/4.1/ascftime.c
index e842b6e82081..088143c6e204 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <time.h>
diff --git a/lib/libcompat/4.1/cftime.3 b/lib/libcompat/4.1/cftime.3
index 058f85cdcabd..6b207973b302 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.
 .\" 
 .\" 
-.\" $Id: cftime.3,v 1.3 1997/02/22 15:05:51 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 15, 1993
 .Os
diff --git a/lib/libcompat/4.1/cftime.c b/lib/libcompat/4.1/cftime.c
index 2e3a34bc71c8..777055f6847f 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <time.h>
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3
index 4d0c53c6efef..e676a957c13f 100644
--- a/lib/libcompat/4.1/ftime.3
+++ b/lib/libcompat/4.1/ftime.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftime.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FTIME 3
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index 7da7e854b69f..cc4a7f9ca071 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libcompat/4.1/getpw.3 b/lib/libcompat/4.1/getpw.3
index df55790af885..523a95c30e95 100644
--- a/lib/libcompat/4.1/getpw.3
+++ b/lib/libcompat/4.1/getpw.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)getpw.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt GETPW 3
diff --git a/lib/libcompat/4.1/getpw.c b/lib/libcompat/4.1/getpw.c
index 82f70250b739..96b4c1228645 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libcompat/4.1/gtty.c b/lib/libcompat/4.1/gtty.c
index 5517ae9e0ebe..524f1a64753d 100644
--- a/lib/libcompat/4.1/gtty.c
+++ b/lib/libcompat/4.1/gtty.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <sgtty.h>
diff --git a/lib/libcompat/4.1/stty.3 b/lib/libcompat/4.1/stty.3
index 2209386209fa..564bf5b68c32 100644
--- a/lib/libcompat/4.1/stty.3
+++ b/lib/libcompat/4.1/stty.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt STTY 3
diff --git a/lib/libcompat/4.1/stty.c b/lib/libcompat/4.1/stty.c
index 3a73c939a938..cf0137f7ac19 100644
--- a/lib/libcompat/4.1/stty.c
+++ b/lib/libcompat/4.1/stty.c
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <sgtty.h>
diff --git a/lib/libcompat/4.1/vlimit.3 b/lib/libcompat/4.1/vlimit.3
index eb363f7e7306..d484a20f01d7 100644
--- a/lib/libcompat/4.1/vlimit.3
+++ b/lib/libcompat/4.1/vlimit.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vlimit.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt VLIMIT 3
diff --git a/lib/libcompat/4.1/vtimes.3 b/lib/libcompat/4.1/vtimes.3
index 0fb0290bfb00..73de4b002f57 100644
--- a/lib/libcompat/4.1/vtimes.3
+++ b/lib/libcompat/4.1/vtimes.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vtimes.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt VTIMES 3
diff --git a/lib/libcompat/4.3/cfree.3 b/lib/libcompat/4.3/cfree.3
index 0f5afb277ddf..7e3bdce0b041 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.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\" " <- this is for hilit19 :)
 .Dd November 23, 1995
 .Dt CFREE 3
diff --git a/lib/libcompat/4.3/insque.3 b/lib/libcompat/4.3/insque.3
index 734cb17dc8e4..4f21d1de2a05 100644
--- a/lib/libcompat/4.3/insque.3
+++ b/lib/libcompat/4.3/insque.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)insque.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt INSQUE 3
diff --git a/lib/libcompat/4.3/lsearch.3 b/lib/libcompat/4.3/lsearch.3
index c9f8ce0d41f2..3a98ed90d114 100644
--- a/lib/libcompat/4.3/lsearch.3
+++ b/lib/libcompat/4.3/lsearch.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lsearch.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt LSEARCH 3
diff --git a/lib/libcompat/4.3/re_comp.3 b/lib/libcompat/4.3/re_comp.3
index 852fa7fed5b9..34cd19deab07 100644
--- a/lib/libcompat/4.3/re_comp.3
+++ b/lib/libcompat/4.3/re_comp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)re_comp.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RE_COMP 3
diff --git a/lib/libcompat/4.3/rexec.3 b/lib/libcompat/4.3/rexec.3
index bf3ea7d84d31..34d53fffd375 100644
--- a/lib/libcompat/4.3/rexec.3
+++ b/lib/libcompat/4.3/rexec.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexec.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt REXEC 3
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 93da76e8dcad..f3b4fc6e3362 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.
 .\" 
-.\" $Id: cuserid.3,v 1.5 1997/02/22 15:06:05 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 10, 1995
 .Os
diff --git a/lib/libcompat/regexp/regexp.3 b/lib/libcompat/regexp/regexp.3
index 6ac024fafa51..0d5c5a7d0b88 100644
--- a/lib/libcompat/regexp/regexp.3
+++ b/lib/libcompat/regexp/regexp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)regexp.3	8.1 (Berkeley) 6/4/93
-.\"     $Id: regexp.3,v 1.4 1999/07/12 20:49:25 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt REGEXP 3
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index d5518c884c5b..c34fcf32f860 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.17 1999/01/24 07:48:30 markm Exp $
+# $FreeBSD$
 #
 
 LCRYPTBASE= 	libcrypt
diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c
index cdd4bbcefc8f..1d52339201e1 100644
--- a/lib/libcrypt/crypt.c
+++ b/lib/libcrypt/crypt.c
@@ -6,12 +6,12 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Header$";
+static char rcsid[] = "$Header: /home/ncvs/src/lib/libcrypt/crypt.c,v 1.9 1999/01/23 08:27:36 markm Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 50462656220e..3839de65e35e 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/2/94
-#	$Id$
+# $FreeBSD$
 
 CFLAGS+=#-DTFILE=\"/dev/ttyp0\"
 CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR}
diff --git a/lib/libcurses/PSD.doc/intro.1 b/lib/libcurses/PSD.doc/intro.1
index 50f89cd1f710..2127d088ce0b 100644
--- a/lib/libcurses/PSD.doc/intro.1
+++ b/lib/libcurses/PSD.doc/intro.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.1	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .bp
 .sh 1 Overview
diff --git a/lib/libcurses/PSD.doc/intro.2 b/lib/libcurses/PSD.doc/intro.2
index cc1666c54b07..10eec24a6fbe 100644
--- a/lib/libcurses/PSD.doc/intro.2
+++ b/lib/libcurses/PSD.doc/intro.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.2	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .sh 1 Variables
 .pp
diff --git a/lib/libcurses/PSD.doc/intro.3 b/lib/libcurses/PSD.doc/intro.3
index 269f0d49af0c..625640871622 100644
--- a/lib/libcurses/PSD.doc/intro.3
+++ b/lib/libcurses/PSD.doc/intro.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .sh 1 Usage
 .pp
diff --git a/lib/libcurses/PSD.doc/intro.4 b/lib/libcurses/PSD.doc/intro.4
index c46b9399f6e0..ba5c72b0cec1 100644
--- a/lib/libcurses/PSD.doc/intro.4
+++ b/lib/libcurses/PSD.doc/intro.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.4	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .sh 1 "Cursor Movement Optimizations"
 .pp
diff --git a/lib/libcurses/PSD.doc/intro.5 b/lib/libcurses/PSD.doc/intro.5
index 67297908a849..156fb82ad159 100644
--- a/lib/libcurses/PSD.doc/intro.5
+++ b/lib/libcurses/PSD.doc/intro.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.5	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .sh 1 "Character Output and Scrolling"
 .pp
diff --git a/lib/libcurses/PSD.doc/intro.6 b/lib/libcurses/PSD.doc/intro.6
index ba31b882e9f3..86697c2a5a16 100644
--- a/lib/libcurses/PSD.doc/intro.6
+++ b/lib/libcurses/PSD.doc/intro.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.6	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .sh 1 "The Functions"
 .pp
diff --git a/lib/libcurses/curses.3 b/lib/libcurses/curses.3
index 31cb7647bfca..c45a251502ac 100644
--- a/lib/libcurses/curses.3
+++ b/lib/libcurses/curses.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)curses.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CURSES 3
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
index 3491a2f124f8..2e78fd9a1a7c 100644
--- a/lib/libcurses/curses.h
+++ b/lib/libcurses/curses.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)curses.h	8.3 (Berkeley) 7/27/94
- *	$Id: curses.h,v 1.14 1997/08/23 23:23:07 steve Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CURSES_H_
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 74c9f12d8e99..ab175cd9b584 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.
 .\"
-.\"	$Id: devstat.3,v 1.3 1999/01/06 04:59:53 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 21, 1998
 .Dt DEVSTAT 3
diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c
index 356bf4fa880a..ed9ea3beaec7 100644
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devstat.c,v 1.4 1998/10/14 23:28:26 ken Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libdevstat/devstat.h b/lib/libdevstat/devstat.h
index e0a54d03ed58..fd0941c2076c 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.
  *
- *	$Id: devstat.h,v 1.1 1998/09/15 06:23:21 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEVSTAT_H
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index 1a3809931453..355018a0db26 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.24 1998/12/30 13:29:11 jkh Exp $
+# $FreeBSD$
 
 LIB=	disk
 SRCS=	blocks.c disklabel.c dkcksum.c chunk.c disk.c change.c \
diff --git a/lib/libdisk/blocks.c b/lib/libdisk/blocks.c
index 3864ec2704c7..10f5b31c74a1 100644
--- a/lib/libdisk/blocks.c
+++ b/lib/libdisk/blocks.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libdisk/change.c b/lib/libdisk/change.c
index a144aa5663bc..6a506f806e15 100644
--- a/lib/libdisk/change.c
+++ b/lib/libdisk/change.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c
index 10cc3563c283..85463fa4610d 100644
--- a/lib/libdisk/chunk.c
+++ b/lib/libdisk/chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: chunk.c,v 1.18 1997/02/22 15:06:30 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index ab660d91116a..0c3c95a4d375 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: create_chunk.c,v 1.36 1999/05/12 23:50:50 msmith Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 73193d4c86d5..e2b46f51791a 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: disk.c,v 1.44 1999/05/09 11:34:56 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libdisk/disklabel.c b/lib/libdisk/disklabel.c
index 9714e6c28f2e..2ee6503225a8 100644
--- a/lib/libdisk/disklabel.c
+++ b/lib/libdisk/disklabel.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index 5657fd32e430..c53b1798ca0c 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.
 .\"
-.\" $Id: libdisk.3,v 1.7 1998/06/06 05:50:52 jkoshy Exp $
+.\" $FreeBSD$
 .\" "
 .Dd March 15, 1996
 .Dt LIBDISK 3
diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h
index 91b1817b6ddd..f7310bf41dd3 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
 * ----------------------------------------------------------------------------
 *
-* $Id: libdisk.h,v 1.29 1998/10/06 11:57:08 dfr Exp $
+* $FreeBSD$
 *
 */
 
diff --git a/lib/libdisk/rules.c b/lib/libdisk/rules.c
index 5bf75ec9cf8f..9e1ca6ee51dc 100644
--- a/lib/libdisk/rules.c
+++ b/lib/libdisk/rules.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libdisk/tst01.c b/lib/libdisk/tst01.c
index 280106ade788..e8c34d9ab6cf 100644
--- a/lib/libdisk/tst01.c
+++ b/lib/libdisk/tst01.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: tst01.c,v 1.21 1997/02/22 15:06:39 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index de7f3edf6aa5..60ddbdafc079 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: write_disk.c,v 1.26 1999/01/29 11:39:24 jkh Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index ffee26312fb9..c1fed73e09de 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.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.
 .\"
-.\"     $Id: editline.3,v 1.6 1999/07/12 20:49:33 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 11, 1997
 .Os BSD 4.4
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index a090b16391be..907a46426217 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd January 11, 1997
 .Os BSD 4.4
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index eca5466d168f..f40f2b630d62 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/12/18 14:32:47 des Exp $
+# $FreeBSD$
 
 MAINTAINER=	des@freebsd.org
 LIB=		fetch
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index e3dab8dfc28a..8b3b891f39f6 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: common.c,v 1.4 1998/12/18 14:32:48 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h
index 0a1154885b78..aa2059c21d67 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.
  *
- *	$Id: common.h,v 1.4 1998/12/18 14:32:48 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _COMMON_H_INCLUDED
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 20b61e28b226..dd0849aea9fb 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: fetch.3,v 1.7 1998/12/21 19:41:50 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 1, 1998
 .Dt FETCH 3
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index d8d2443787ce..bf4476f7f50d 100644
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fetch.c,v 1.7 1998/12/16 10:24:54 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/lib/libfetch/fetch.h b/lib/libfetch/fetch.h
index 2e33245503cc..df3450949b04 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.
  *
- *	$Id: fetch.h,v 1.7 1998/12/16 10:24:55 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _FETCH_H_INCLUDED
diff --git a/lib/libfetch/fetch_err.et b/lib/libfetch/fetch_err.et
index 2e247a6006aa..2593ebaf2212 100644
--- a/lib/libfetch/fetch_err.et
+++ b/lib/libfetch/fetch_err.et
@@ -25,7 +25,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id: fetch_err.et,v 1.1 1998/11/06 22:14:08 des Exp $
+# $FreeBSD$
 #
 et ftch
     ec FETCH_ABORT,	"Operation aborted"
diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index 15cb043f52b1..5b594c49e0a1 100644
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: file.c,v 1.3 1998/12/16 10:24:55 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index 10e27b45ae93..a3279e153d44 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ftp.c,v 1.11 1998/12/18 14:32:48 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libfetch/ftp.errors b/lib/libfetch/ftp.errors
index d7816d28deda..b9034c5f7baf 100644
--- a/lib/libfetch/ftp.errors
+++ b/lib/libfetch/ftp.errors
@@ -1,4 +1,4 @@
-# $Id: ftp.errors,v 1.1.1.1 1998/07/09 16:52:43 des Exp $
+# $FreeBSD$
 #
 # 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 0d5804a885c4..716d6c2a139f 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: http.c,v 1.10 1998/12/18 14:32:48 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libfetch/http.errors b/lib/libfetch/http.errors
index 26907d538adc..37e106cd635c 100644
--- a/lib/libfetch/http.errors
+++ b/lib/libfetch/http.errors
@@ -1,4 +1,4 @@
-# $Id: http.errors,v 1.1.1.1 1998/07/09 16:52:44 des Exp $
+# $FreeBSD$
 #
 # This list is taken from RFC 2068.
 #
diff --git a/lib/libftpio/ftp.errors b/lib/libftpio/ftp.errors
index 26cb4f61a805..7ae444515e78 100644
--- a/lib/libftpio/ftp.errors
+++ b/lib/libftpio/ftp.errors
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # 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 9a7e554f5ce9..6ff314620d1a 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.
 .\"
-.\"	$Id: ftpio.3,v 1.17 1998/03/19 07:34:09 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 17, 1996
 .Dt FTPIO 3
diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c
index 6a1d7ab86228..45f7012a98b2 100644
--- a/lib/libftpio/ftpio.c
+++ b/lib/libftpio/ftpio.c
@@ -14,7 +14,7 @@
  * Turned inside out. Now returns xfers as new file ids, not as a special
  * `state' of FTP_t
  *
- * $Id: ftpio.c,v 1.30 1998/04/11 07:28:53 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libftpio/ftpio.h b/lib/libftpio/ftpio.h
index 41e7c1e29f72..26d4f90cd422 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
  *
- * $Id: ftpio.h,v 1.13 1997/05/05 11:18:55 jkh Exp $
+ * $FreeBSD$
  */
 
 /* Internal housekeeping data structure for FTP sessions */
diff --git a/lib/libgnumalloc/Makefile b/lib/libgnumalloc/Makefile
index f7f8b0d156a5..cddf5bad684a 100644
--- a/lib/libgnumalloc/Makefile
+++ b/lib/libgnumalloc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1997/02/22 15:06:55 peter Exp $
+# $FreeBSD$
 
 LIB=		gnumalloc
 INTERNALLIB=	yes		# Do not build or install ${LIB}*.a
diff --git a/lib/libio/Makefile b/lib/libio/Makefile
index b9aeebdcaa79..71e1c9e09cc6 100644
--- a/lib/libio/Makefile
+++ b/lib/libio/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 LIB=		io
 SHLIB_MAJOR=	1
diff --git a/lib/libio/alpha_sethae.c b/lib/libio/alpha_sethae.c
index 365b0514965a..337cafa79121 100644
--- a/lib/libio/alpha_sethae.c
+++ b/lib/libio/alpha_sethae.c
@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
-static const char rcsid[] = "$Id$";
+static const char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_RCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libio/bwx.c b/lib/libio/bwx.c
index fbccc06efc43..bc3bbb31d629 100644
--- a/lib/libio/bwx.c
+++ b/lib/libio/bwx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bwx.c,v 1.1 1998/12/12 18:05:06 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/lib/libio/io.c b/lib/libio/io.c
index f847755a5793..7abfa36f6ff2 100644
--- a/lib/libio/io.c
+++ b/lib/libio/io.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libio/io.h b/lib/libio/io.h
index a166355612ea..1f4c62034ef3 100644
--- a/lib/libio/io.h
+++ b/lib/libio/io.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 struct io_ops {
diff --git a/lib/libio/swiz.c b/lib/libio/swiz.c
index 28848c1d95fe..bee9f6d4d7b7 100644
--- a/lib/libio/swiz.c
+++ b/lib/libio/swiz.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swiz.c,v 1.1 1998/12/12 18:05:06 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/lib/libipx/ipx.3 b/lib/libipx/ipx.3
index ded91e6139ba..c005a4d8e220 100644
--- a/lib/libipx/ipx.3
+++ b/lib/libipx/ipx.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt IPX 3
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index eddc4ba3da66..3cc39fbd862d 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.17 1999/07/05 00:38:12 jasone Exp $
+# $FreeBSD$
 #
 # All library objects contain rcsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libkse/sys/Makefile.inc b/lib/libkse/sys/Makefile.inc
index 50952cdfad1a..e608afa69909 100644
--- a/lib/libkse/sys/Makefile.inc
+++ b/lib/libkse/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.8 1998/04/29 11:03:34 jb Exp $
+# $FreeBSD$
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}
 
diff --git a/lib/libkse/sys/thr_error.c b/lib/libkse/sys/thr_error.c
index 9f9e1a514cd8..0d08ae83729a 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libkse/test/Makefile b/lib/libkse/test/Makefile
index c39497945f06..90ee5ad59ea4 100644
--- a/lib/libkse/test/Makefile
+++ b/lib/libkse/test/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/09/30 07:07:59 jb Exp $
+# $FreeBSD$
 #
 # Tests for libc_r functionality.
 #
diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc
index 22e954861e03..d42c04b1c871 100644
--- a/lib/libkse/thread/Makefile.inc
+++ b/lib/libkse/thread/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.17 1999/03/23 05:07:54 jb Exp $
+# $FreeBSD$
 
 # uthread sources
 .PATH: ${.CURDIR}/uthread
diff --git a/lib/libkse/thread/thr_attr_destroy.c b/lib/libkse/thread/thr_attr_destroy.c
index e972d5f24813..dfe668ea2181 100644
--- a/lib/libkse/thread/thr_attr_destroy.c
+++ b/lib/libkse/thread/thr_attr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_attr_getdetachstate.c b/lib/libkse/thread/thr_attr_getdetachstate.c
index 8a986b3c8977..fee1e8b11a2a 100644
--- a/lib/libkse/thread/thr_attr_getdetachstate.c
+++ b/lib/libkse/thread/thr_attr_getdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_getinheritsched.c b/lib/libkse/thread/thr_attr_getinheritsched.c
index 5cf5b63cb724..f98fde7fac83 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_getschedparam.c b/lib/libkse/thread/thr_attr_getschedparam.c
index bac609fda8ca..61c68913de2f 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_getschedpolicy.c b/lib/libkse/thread/thr_attr_getschedpolicy.c
index 5248780c5d01..6ebc76492653 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_getscope.c b/lib/libkse/thread/thr_attr_getscope.c
index e62cc4182d72..f456585af966 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_getstackaddr.c b/lib/libkse/thread/thr_attr_getstackaddr.c
index 78f0d429e577..1fee4a5f8717 100644
--- a/lib/libkse/thread/thr_attr_getstackaddr.c
+++ b/lib/libkse/thread/thr_attr_getstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_getstacksize.c b/lib/libkse/thread/thr_attr_getstacksize.c
index a5989b53ec4d..5c7a9e071359 100644
--- a/lib/libkse/thread/thr_attr_getstacksize.c
+++ b/lib/libkse/thread/thr_attr_getstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_init.c b/lib/libkse/thread/thr_attr_init.c
index 6233d737324c..dbe3091b0ab2 100644
--- a/lib/libkse/thread/thr_attr_init.c
+++ b/lib/libkse/thread/thr_attr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 311ff27d2e63..d230397f743f 100644
--- a/lib/libkse/thread/thr_attr_setcreatesuspend_np.c
+++ b/lib/libkse/thread/thr_attr_setcreatesuspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_setdetachstate.c b/lib/libkse/thread/thr_attr_setdetachstate.c
index f0c58ecccbd8..36a846a34abf 100644
--- a/lib/libkse/thread/thr_attr_setdetachstate.c
+++ b/lib/libkse/thread/thr_attr_setdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_setinheritsched.c b/lib/libkse/thread/thr_attr_setinheritsched.c
index 06335235caa7..eb2384b8fc2b 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_setschedparam.c b/lib/libkse/thread/thr_attr_setschedparam.c
index 0846c651008d..17b93b4ec523 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_setschedpolicy.c b/lib/libkse/thread/thr_attr_setschedpolicy.c
index 36fac6f45342..640cb38f0b06 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_setscope.c b/lib/libkse/thread/thr_attr_setscope.c
index 70ac8bb7d193..84239d7f6613 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_setstackaddr.c b/lib/libkse/thread/thr_attr_setstackaddr.c
index 58686ca32266..7eb8c5d1319c 100644
--- a/lib/libkse/thread/thr_attr_setstackaddr.c
+++ b/lib/libkse/thread/thr_attr_setstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_attr_setstacksize.c b/lib/libkse/thread/thr_attr_setstacksize.c
index cf306d27c795..2a2d85482e0a 100644
--- a/lib/libkse/thread/thr_attr_setstacksize.c
+++ b/lib/libkse/thread/thr_attr_setstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_clean.c b/lib/libkse/thread/thr_clean.c
index 496858b75942..bba5500c8fe7 100644
--- a/lib/libkse/thread/thr_clean.c
+++ b/lib/libkse/thread/thr_clean.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_close.c b/lib/libkse/thread/thr_close.c
index 6799832ee488..9eba4332f060 100644
--- a/lib/libkse/thread/thr_close.c
+++ b/lib/libkse/thread/thr_close.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_close.c,v 1.5 1999/06/20 08:28:11 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_cond.c b/lib/libkse/thread/thr_cond.c
index 4d52c631dcdc..079a635f8de5 100644
--- a/lib/libkse/thread/thr_cond.c
+++ b/lib/libkse/thread/thr_cond.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_cond.c,v 1.15 1999/06/20 08:28:13 jb Exp $
+ * $FreeBSD$
  */
 #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 2ea3ce75d5f0..ad91228c3050 100644
--- a/lib/libkse/thread/thr_condattr_destroy.c
+++ b/lib/libkse/thread/thr_condattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 9d9b610cb967..33798982f330 100644
--- a/lib/libkse/thread/thr_condattr_init.c
+++ b/lib/libkse/thread/thr_condattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_create.c b/lib/libkse/thread/thr_create.c
index 25cf2b0640fb..b3ea39124a7c 100644
--- a/lib/libkse/thread/thr_create.c
+++ b/lib/libkse/thread/thr_create.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_create.c,v 1.17 1999/07/11 06:06:52 jasone Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_detach.c b/lib/libkse/thread/thr_detach.c
index 7f24abb8ff18..164c7dfe54e1 100644
--- a/lib/libkse/thread/thr_detach.c
+++ b/lib/libkse/thread/thr_detach.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_detach.c,v 1.8 1999/06/20 08:28:15 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_equal.c b/lib/libkse/thread/thr_equal.c
index 690a55aa4e45..e03ba4afe445 100644
--- a/lib/libkse/thread/thr_equal.c
+++ b/lib/libkse/thread/thr_equal.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_exit.c b/lib/libkse/thread/thr_exit.c
index 6ff4f334beac..c9894435748d 100644
--- a/lib/libkse/thread/thr_exit.c
+++ b/lib/libkse/thread/thr_exit.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_exit.c,v 1.9 1999/06/20 08:28:17 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libkse/thread/thr_fcntl.c b/lib/libkse/thread/thr_fcntl.c
index 485ed4374c7d..9a6293c5e3c8 100644
--- a/lib/libkse/thread/thr_fcntl.c
+++ b/lib/libkse/thread/thr_fcntl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdarg.h>
 #include <unistd.h>
diff --git a/lib/libkse/thread/thr_find_thread.c b/lib/libkse/thread/thr_find_thread.c
index 6fc94457f2a5..d4a3bbd1162d 100644
--- a/lib/libkse/thread/thr_find_thread.c
+++ b/lib/libkse/thread/thr_find_thread.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_find_thread.c,v 1.3 1999/06/20 08:28:22 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_fork.c b/lib/libkse/thread/thr_fork.c
index f2e352c210dd..93d4a6869e5d 100644
--- a/lib/libkse/thread/thr_fork.c
+++ b/lib/libkse/thread/thr_fork.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_fork.c,v 1.11 1999/08/05 12:15:11 deischen Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libkse/thread/thr_fsync.c b/lib/libkse/thread/thr_fsync.c
index 93de8c8e98a3..3287edda8274 100644
--- a/lib/libkse/thread/thr_fsync.c
+++ b/lib/libkse/thread/thr_fsync.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <unistd.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_getprio.c b/lib/libkse/thread/thr_getprio.c
index 0ec97061d9ef..2f94b86b64af 100644
--- a/lib/libkse/thread/thr_getprio.c
+++ b/lib/libkse/thread/thr_getprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_getschedparam.c b/lib/libkse/thread/thr_getschedparam.c
index 7642f5812908..b6c0c35c7bb6 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_info.c b/lib/libkse/thread/thr_info.c
index d005bab50a80..ed4a58db4647 100644
--- a/lib/libkse/thread/thr_info.c
+++ b/lib/libkse/thread/thr_info.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_info.c,v 1.11 1999/06/20 08:28:26 jb Exp $
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/lib/libkse/thread/thr_init.c b/lib/libkse/thread/thr_init.c
index c80427a73420..a2ce49331899 100644
--- a/lib/libkse/thread/thr_init.c
+++ b/lib/libkse/thread/thr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_init.c,v 1.16 1999/07/12 16:09:30 dt Exp $
+ * $FreeBSD$
  */
 
 /* Allocate space for global thread variables here: */
diff --git a/lib/libkse/thread/thr_join.c b/lib/libkse/thread/thr_join.c
index e3d6c483669c..8b000825b207 100644
--- a/lib/libkse/thread/thr_join.c
+++ b/lib/libkse/thread/thr_join.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_join.c,v 1.7 1999/06/20 08:28:29 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_kern.c b/lib/libkse/thread/thr_kern.c
index c0e4a5de212c..3331a5df0bc7 100644
--- a/lib/libkse/thread/thr_kern.c
+++ b/lib/libkse/thread/thr_kern.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_kern.c,v 1.20 1999/08/12 19:34:39 deischen Exp $
+ * $FreeBSD$
  *
  */
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_kill.c b/lib/libkse/thread/thr_kill.c
index fd43a10536a6..6b25550330a9 100644
--- a/lib/libkse/thread/thr_kill.c
+++ b/lib/libkse/thread/thr_kill.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_kill.c,v 1.7 1999/06/20 08:28:32 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libkse/thread/thr_mattr_init.c b/lib/libkse/thread/thr_mattr_init.c
index c65c87ab70a5..63d4401f2553 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 5a1dcd81c74c..8b3b8cbafaf5 100644
--- a/lib/libkse/thread/thr_mattr_kind_np.c
+++ b/lib/libkse/thread/thr_mattr_kind_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_multi_np.c b/lib/libkse/thread/thr_multi_np.c
index 421d2a4252fe..39dd948cbc4f 100644
--- a/lib/libkse/thread/thr_multi_np.c
+++ b/lib/libkse/thread/thr_multi_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_mutex.c b/lib/libkse/thread/thr_mutex.c
index c967b4698154..a402d4bc2159 100644
--- a/lib/libkse/thread/thr_mutex.c
+++ b/lib/libkse/thread/thr_mutex.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 5effb8ad495d..c193c82a9c80 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 7b86e5bb0756..9847ae529eb8 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #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 376f538440b7..9afebad917d2 100644
--- a/lib/libkse/thread/thr_mutexattr_destroy.c
+++ b/lib/libkse/thread/thr_mutexattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_nanosleep.c b/lib/libkse/thread/thr_nanosleep.c
index 41488ffae554..a922040d2faf 100644
--- a/lib/libkse/thread/thr_nanosleep.c
+++ b/lib/libkse/thread/thr_nanosleep.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_nanosleep.c,v 1.8 1999/08/19 23:06:10 alfred Exp $
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_once.c b/lib/libkse/thread/thr_once.c
index 3f99778e21a7..ea56d82c4d83 100644
--- a/lib/libkse/thread/thr_once.c
+++ b/lib/libkse/thread/thr_once.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_open.c b/lib/libkse/thread/thr_open.c
index 766bc283b50e..2f30ae727c53 100644
--- a/lib/libkse/thread/thr_open.c
+++ b/lib/libkse/thread/thr_open.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_open.c,v 1.4 1998/04/29 09:59:07 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <stdarg.h>
diff --git a/lib/libkse/thread/thr_poll.c b/lib/libkse/thread/thr_poll.c
index 2acd725dea5f..4967e6c78afd 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.
  *
- * $Id: uthread_poll.c,v 1.1 1999/06/20 08:28:36 jb Exp $
+ * $FreeBSD$
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_priority_queue.c b/lib/libkse/thread/thr_priority_queue.c
index 0a00a9d3dc50..5bd8a8cc2826 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h
index 65203d5c8fad..c6c1100522c0 100644
--- a/lib/libkse/thread/thr_private.h
+++ b/lib/libkse/thread/thr_private.h
@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $Id: pthread_private.h,v 1.24 1999/07/12 16:09:30 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PTHREAD_PRIVATE_H
diff --git a/lib/libkse/thread/thr_read.c b/lib/libkse/thread/thr_read.c
index b2da6559f919..0376827b1c59 100644
--- a/lib/libkse/thread/thr_read.c
+++ b/lib/libkse/thread/thr_read.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_read.c,v 1.6 1998/06/10 22:28:43 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_readv.c b/lib/libkse/thread/thr_readv.c
index cbf5b451c6a7..a1a862d42490 100644
--- a/lib/libkse/thread/thr_readv.c
+++ b/lib/libkse/thread/thr_readv.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_readv.c,v 1.6 1998/06/10 22:28:44 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_resume_np.c b/lib/libkse/thread/thr_resume_np.c
index e83dcc76d3bf..98ec7186d8f9 100644
--- a/lib/libkse/thread/thr_resume_np.c
+++ b/lib/libkse/thread/thr_resume_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_resume_np.c,v 1.5 1999/06/20 08:28:40 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_rwlock.c b/lib/libkse/thread/thr_rwlock.c
index f398a1857d4a..648e8a394eeb 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.
  *
- *	$Id: uthread_rwlock.c,v 1.2 1998/09/07 19:23:55 alex Exp $
+ * $FreeBSD$
  */
 
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_rwlockattr.c b/lib/libkse/thread/thr_rwlockattr.c
index 50b128b92807..3330ba19ff3e 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.
  *
- *	$Id: uthread_rwlockattr.c,v 1.1 1998/09/07 19:01:43 alex Exp $
+ * $FreeBSD$
  */
 
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_select.c b/lib/libkse/thread/thr_select.c
index 217916003f7f..a7ea8cfabcd7 100644
--- a/lib/libkse/thread/thr_select.c
+++ b/lib/libkse/thread/thr_select.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_select.c,v 1.10 1999/08/19 23:06:11 alfred Exp $
+ * $FreeBSD$
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_self.c b/lib/libkse/thread/thr_self.c
index e6e11e446731..81ec427a3f04 100644
--- a/lib/libkse/thread/thr_self.c
+++ b/lib/libkse/thread/thr_self.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_seterrno.c b/lib/libkse/thread/thr_seterrno.c
index 445d2600a1a6..1934aac7222a 100644
--- a/lib/libkse/thread/thr_seterrno.c
+++ b/lib/libkse/thread/thr_seterrno.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_setprio.c b/lib/libkse/thread/thr_setprio.c
index 3ef2df0eb1ae..5f7b44ad31e5 100644
--- a/lib/libkse/thread/thr_setprio.c
+++ b/lib/libkse/thread/thr_setprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_setschedparam.c b/lib/libkse/thread/thr_setschedparam.c
index 1ba0e207275e..bb66fe50ba67 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <sys/param.h>
diff --git a/lib/libkse/thread/thr_sig.c b/lib/libkse/thread/thr_sig.c
index 17a3a959cf27..b6aad9ce7e67 100644
--- a/lib/libkse/thread/thr_sig.c
+++ b/lib/libkse/thread/thr_sig.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sig.c,v 1.17 1999/06/20 08:28:44 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <fcntl.h>
diff --git a/lib/libkse/thread/thr_sigaction.c b/lib/libkse/thread/thr_sigaction.c
index c5640d73cd66..7fa8ebff330d 100644
--- a/lib/libkse/thread/thr_sigaction.c
+++ b/lib/libkse/thread/thr_sigaction.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sigaction.c,v 1.6 1999/06/20 08:28:46 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_sigmask.c b/lib/libkse/thread/thr_sigmask.c
index 037ae1cb3d88..514f8fa750e5 100644
--- a/lib/libkse/thread/thr_sigmask.c
+++ b/lib/libkse/thread/thr_sigmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libkse/thread/thr_sigpending.c b/lib/libkse/thread/thr_sigpending.c
index 28305d3f1b01..2d61e2104788 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_sigprocmask.c b/lib/libkse/thread/thr_sigprocmask.c
index a80d8f9bdbd2..945592202fb4 100644
--- a/lib/libkse/thread/thr_sigprocmask.c
+++ b/lib/libkse/thread/thr_sigprocmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_sigsuspend.c b/lib/libkse/thread/thr_sigsuspend.c
index bbf7380f7f68..ac06ff71ba46 100644
--- a/lib/libkse/thread/thr_sigsuspend.c
+++ b/lib/libkse/thread/thr_sigsuspend.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_sigwait.c b/lib/libkse/thread/thr_sigwait.c
index e044a6468f5a..7257b7e794cc 100644
--- a/lib/libkse/thread/thr_sigwait.c
+++ b/lib/libkse/thread/thr_sigwait.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sigwait.c,v 1.6 1999/06/20 08:28:47 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libkse/thread/thr_single_np.c b/lib/libkse/thread/thr_single_np.c
index 12674d2cbca6..d6ecb48b4259 100644
--- a/lib/libkse/thread/thr_single_np.c
+++ b/lib/libkse/thread/thr_single_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_spec.c b/lib/libkse/thread/thr_spec.c
index d54bd892f116..f1e9f5c08a9b 100644
--- a/lib/libkse/thread/thr_spec.c
+++ b/lib/libkse/thread/thr_spec.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <stdlib.h>
diff --git a/lib/libkse/thread/thr_spinlock.c b/lib/libkse/thread/thr_spinlock.c
index d84cf3143b20..4e94ffcb3e0f 100644
--- a/lib/libkse/thread/thr_spinlock.c
+++ b/lib/libkse/thread/thr_spinlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_spinlock.c,v 1.5 1999/03/23 05:07:56 jb Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libkse/thread/thr_suspend_np.c b/lib/libkse/thread/thr_suspend_np.c
index b83057d2ad92..ea9b1f857af5 100644
--- a/lib/libkse/thread/thr_suspend_np.c
+++ b/lib/libkse/thread/thr_suspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_suspend_np.c,v 1.5 1999/06/20 08:28:48 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_switch_np.c b/lib/libkse/thread/thr_switch_np.c
index 8e5721e5a036..9b83545fdd7e 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libkse/thread/thr_wait4.c b/lib/libkse/thread/thr_wait4.c
index 64394f8978a9..fc6cfba69f1e 100644
--- a/lib/libkse/thread/thr_wait4.c
+++ b/lib/libkse/thread/thr_wait4.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <sys/wait.h>
diff --git a/lib/libkse/thread/thr_write.c b/lib/libkse/thread/thr_write.c
index f94623b633ae..9292add9027e 100644
--- a/lib/libkse/thread/thr_write.c
+++ b/lib/libkse/thread/thr_write.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_write.c,v 1.10 1998/09/07 21:55:01 alex Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_writev.c b/lib/libkse/thread/thr_writev.c
index aad77fea19e6..8ca5db7d8264 100644
--- a/lib/libkse/thread/thr_writev.c
+++ b/lib/libkse/thread/thr_writev.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_writev.c,v 1.10 1998/06/14 09:36:14 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libkse/thread/thr_yield.c b/lib/libkse/thread/thr_yield.c
index 7b388427c2f8..064dd826d34c 100644
--- a/lib/libkse/thread/thr_yield.c
+++ b/lib/libkse/thread/thr_yield.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
index 75c152acdb8d..7647ca676081 100644
--- a/lib/libkvm/kvm.3
+++ b/lib/libkvm/kvm.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt KVM 3
diff --git a/lib/libkvm/kvm_alpha.c b/lib/libkvm/kvm_alpha.c
index 1323b36bbdd7..391a9552f6b6 100644
--- a/lib/libkvm/kvm_alpha.c
+++ b/lib/libkvm/kvm_alpha.c
@@ -1,4 +1,4 @@
-/* $Id: kvm_alpha.c,v 1.1 1998/08/15 12:12:22 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $	*/
 
 /*
diff --git a/lib/libkvm/kvm_geterr.3 b/lib/libkvm/kvm_geterr.3
index 52adf1fb2a1b..bab730e75cb3 100644
--- a/lib/libkvm/kvm_geterr.3
+++ b/lib/libkvm/kvm_geterr.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_geterr.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETERR 3
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index 18eeb6150eee..0f8050df3d2c 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getfiles.3	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt KVM_GETFILES 3
diff --git a/lib/libkvm/kvm_getloadavg.3 b/lib/libkvm/kvm_getloadavg.3
index 4f304347b750..7df1847158e7 100644
--- a/lib/libkvm/kvm_getloadavg.3
+++ b/lib/libkvm/kvm_getloadavg.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getloadavg.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETLOADAVG 3
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index 1ecfe1444564..bd6bb74e9bb9 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_getprocs.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt KVM_GETPROCS 3
diff --git a/lib/libkvm/kvm_getswapinfo.3 b/lib/libkvm/kvm_getswapinfo.3
index a43a6e1e2571..dfcac1ff5cab 100644
--- a/lib/libkvm/kvm_getswapinfo.3
+++ b/lib/libkvm/kvm_getswapinfo.3
@@ -4,7 +4,7 @@
 .\" modification, are permitted provided under the terms of the BSD
 .\" Copyright as found in /usr/src/COPYRIGHT in the FreeBSD source tree.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd January 22, 1999
 .Dt KVM_SWAPINFO 3
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index 96f5ec7ad142..535a9d073201 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -14,7 +14,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: kvm_getswapinfo.c,v 1.6 1999/02/14 21:42:05 dt Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
index 10061c78b7d9..f5611b332d2f 100644
--- a/lib/libkvm/kvm_nlist.3
+++ b/lib/libkvm/kvm_nlist.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_nlist.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt KVM_NLIST 3
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index ef4954060d13..b79170873e7e 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_open.3	8.3 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt KVM_OPEN 3
diff --git a/lib/libkvm/kvm_read.3 b/lib/libkvm/kvm_read.3
index df5008f98239..f8d5e0a88fa2 100644
--- a/lib/libkvm/kvm_read.3
+++ b/lib/libkvm/kvm_read.3
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm_read.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt KVM_READ 3
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
index dc05cfcb668b..d00d6d7f96a0 100644
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.5 1997/02/22 15:07:03 peter Exp $
+# $FreeBSD$
 #
 # ieee		- for most IEEE machines, we hope.
 # mc68881	- the, ahem, mc68881.
diff --git a/lib/libm/common_source/acos.3 b/lib/libm/common_source/acos.3
index fe127fc4c68e..a3e5e7a549a6 100644
--- a/lib/libm/common_source/acos.3
+++ b/lib/libm/common_source/acos.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acos.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ACOS 3
diff --git a/lib/libm/common_source/acosh.3 b/lib/libm/common_source/acosh.3
index 0175c8444abc..578a0dfc8da8 100644
--- a/lib/libm/common_source/acosh.3
+++ b/lib/libm/common_source/acosh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acosh.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ACOSH 3
diff --git a/lib/libm/common_source/asin.3 b/lib/libm/common_source/asin.3
index abcab8703c45..5f04c598b0b0 100644
--- a/lib/libm/common_source/asin.3
+++ b/lib/libm/common_source/asin.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)asin.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ASIN 3
diff --git a/lib/libm/common_source/asinh.3 b/lib/libm/common_source/asinh.3
index b8e75eba742d..657451fadd46 100644
--- a/lib/libm/common_source/asinh.3
+++ b/lib/libm/common_source/asinh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)asinh.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ASINH 3
diff --git a/lib/libm/common_source/atan.3 b/lib/libm/common_source/atan.3
index e1016ebe347b..a1564bda8092 100644
--- a/lib/libm/common_source/atan.3
+++ b/lib/libm/common_source/atan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atan.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ATAN 3
diff --git a/lib/libm/common_source/atan2.3 b/lib/libm/common_source/atan2.3
index 3323e01b1050..027ab8bcac67 100644
--- a/lib/libm/common_source/atan2.3
+++ b/lib/libm/common_source/atan2.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atan2.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ATAN2 3
diff --git a/lib/libm/common_source/atanh.3 b/lib/libm/common_source/atanh.3
index 2af92102544b..2ddcc3a5c2a3 100644
--- a/lib/libm/common_source/atanh.3
+++ b/lib/libm/common_source/atanh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atanh.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ATANH 3
diff --git a/lib/libm/common_source/ceil.3 b/lib/libm/common_source/ceil.3
index dba42cbfaaf4..aed159f38f92 100644
--- a/lib/libm/common_source/ceil.3
+++ b/lib/libm/common_source/ceil.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ceil.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt CEIL 3
diff --git a/lib/libm/common_source/cos.3 b/lib/libm/common_source/cos.3
index 2dad5d44369e..9de38c141df8 100644
--- a/lib/libm/common_source/cos.3
+++ b/lib/libm/common_source/cos.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cos.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt COS 3
diff --git a/lib/libm/common_source/cosh.3 b/lib/libm/common_source/cosh.3
index b0dfbe611f2c..311b794fb204 100644
--- a/lib/libm/common_source/cosh.3
+++ b/lib/libm/common_source/cosh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cosh.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt COSH 3
diff --git a/lib/libm/common_source/erf.3 b/lib/libm/common_source/erf.3
index b98cd3d89aa9..4618fb915ce3 100644
--- a/lib/libm/common_source/erf.3
+++ b/lib/libm/common_source/erf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)erf.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt ERF 3
diff --git a/lib/libm/common_source/exp.3 b/lib/libm/common_source/exp.3
index fb5900e35c6b..39e1384a1958 100644
--- a/lib/libm/common_source/exp.3
+++ b/lib/libm/common_source/exp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exp.3	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt EXP 3
diff --git a/lib/libm/common_source/fabs.3 b/lib/libm/common_source/fabs.3
index c8d4b28390fd..7e2c0a7e3378 100644
--- a/lib/libm/common_source/fabs.3
+++ b/lib/libm/common_source/fabs.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fabs.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FABS 3
diff --git a/lib/libm/common_source/floor.3 b/lib/libm/common_source/floor.3
index f6a107608130..5517f00fc493 100644
--- a/lib/libm/common_source/floor.3
+++ b/lib/libm/common_source/floor.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)floor.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FLOOR 3
diff --git a/lib/libm/common_source/fmod.3 b/lib/libm/common_source/fmod.3
index d1645664e04a..43309a58c92c 100644
--- a/lib/libm/common_source/fmod.3
+++ b/lib/libm/common_source/fmod.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmod.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt FMOD 3
diff --git a/lib/libm/common_source/hypot.3 b/lib/libm/common_source/hypot.3
index 7087cef03a92..2d2ad3eefe69 100644
--- a/lib/libm/common_source/hypot.3
+++ b/lib/libm/common_source/hypot.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)hypot.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt HYPOT 3
diff --git a/lib/libm/common_source/ieee.3 b/lib/libm/common_source/ieee.3
index 5b62fe82bfdf..29eb44c6bfa1 100644
--- a/lib/libm/common_source/ieee.3
+++ b/lib/libm/common_source/ieee.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ieee.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt IEEE 3
diff --git a/lib/libm/common_source/infnan.3 b/lib/libm/common_source/infnan.3
index c7286469d2fe..abb77830a9a3 100644
--- a/lib/libm/common_source/infnan.3
+++ b/lib/libm/common_source/infnan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)infnan.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt INFNAN 3
diff --git a/lib/libm/common_source/j0.3 b/lib/libm/common_source/j0.3
index 49467024f2f9..47f412b987aa 100644
--- a/lib/libm/common_source/j0.3
+++ b/lib/libm/common_source/j0.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)j0.3	8.2 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt J0 3
diff --git a/lib/libm/common_source/lgamma.3 b/lib/libm/common_source/lgamma.3
index a98fc6950e66..d15c7a462a8d 100644
--- a/lib/libm/common_source/lgamma.3
+++ b/lib/libm/common_source/lgamma.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lgamma.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt LGAMMA 3
diff --git a/lib/libm/common_source/math.3 b/lib/libm/common_source/math.3
index 773d8d54ee2b..e935c73adac0 100644
--- a/lib/libm/common_source/math.3
+++ b/lib/libm/common_source/math.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)math.3	8.2 (Berkeley) 5/5/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH MATH 3 "May 5, 1994"
 .UC 4
diff --git a/lib/libm/common_source/rint.3 b/lib/libm/common_source/rint.3
index 0916b9434cb0..b8986f172cd2 100644
--- a/lib/libm/common_source/rint.3
+++ b/lib/libm/common_source/rint.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rint.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt RINT 3
diff --git a/lib/libm/common_source/sin.3 b/lib/libm/common_source/sin.3
index d1cf35989f09..87ddc238d579 100644
--- a/lib/libm/common_source/sin.3
+++ b/lib/libm/common_source/sin.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sin.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SIN 3
diff --git a/lib/libm/common_source/sinh.3 b/lib/libm/common_source/sinh.3
index 8dfa13782d7b..f285d7ec5c72 100644
--- a/lib/libm/common_source/sinh.3
+++ b/lib/libm/common_source/sinh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sinh.3	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SINH 3
diff --git a/lib/libm/common_source/sqrt.3 b/lib/libm/common_source/sqrt.3
index 5a04f88df49b..067a70ef1eb7 100644
--- a/lib/libm/common_source/sqrt.3
+++ b/lib/libm/common_source/sqrt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sqrt.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt SQRT 3
diff --git a/lib/libm/common_source/tan.3 b/lib/libm/common_source/tan.3
index 2196f5a40d3a..801464b42daf 100644
--- a/lib/libm/common_source/tan.3
+++ b/lib/libm/common_source/tan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tan.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TAN 3
diff --git a/lib/libm/common_source/tanh.3 b/lib/libm/common_source/tanh.3
index a35ba4d80625..102e60618a63 100644
--- a/lib/libm/common_source/tanh.3
+++ b/lib/libm/common_source/tanh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tanh.3	8.1 (Berkeley) 6/4/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt TANH 3
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index 2dc29ed1b765..3264f0a2c510 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.31 1999/03/01 02:39:45 wollman Exp $
+# $FreeBSD$
 
 LIB=	md
 SRCS=	md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c \
diff --git a/lib/libmd/md2.copyright b/lib/libmd/md2.copyright
index 5f0456025108..acef7bab5be6 100644
--- a/lib/libmd/md2.copyright
+++ b/lib/libmd/md2.copyright
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 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 9c1ac5d269cc..8215038cc577 100644
--- a/lib/libmd/md2.h
+++ b/lib/libmd/md2.h
@@ -1,5 +1,5 @@
 /* MD2.H - header file for MD2C.C
- * $Id: md2.h,v 1.6 1997/08/25 05:24:24 joerg Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmd/md2c.c b/lib/libmd/md2c.c
index 561337a87ea9..97edfbe5a437 100644
--- a/lib/libmd/md2c.c
+++ b/lib/libmd/md2c.c
@@ -1,5 +1,5 @@
 /* MD2C.C - RSA Data Security, Inc., MD2 message-digest algorithm
- * $Id: md2c.c,v 1.5 1997/02/22 15:07:15 peter Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmd/md4.copyright b/lib/libmd/md4.copyright
index df93ad0a9347..e4502073a1ce 100644
--- a/lib/libmd/md4.copyright
+++ b/lib/libmd/md4.copyright
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 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 cee0e4a6b10f..5a648c87f63a 100644
--- a/lib/libmd/md4.h
+++ b/lib/libmd/md4.h
@@ -1,5 +1,5 @@
 /* MD4.H - header file for MD4C.C
- * $Id: md4.h,v 1.7 1997/08/25 05:24:24 joerg Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/lib/libmd/md4c.c b/lib/libmd/md4c.c
index 71c3af7ffd7a..a51c73965921 100644
--- a/lib/libmd/md4c.c
+++ b/lib/libmd/md4c.c
@@ -1,5 +1,5 @@
 /* MD4C.C - RSA Data Security, Inc., MD4 message-digest algorithm
- * $Id: md4c.c,v 1.5 1997/02/22 15:07:19 peter Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
diff --git a/lib/libmd/md5.copyright b/lib/libmd/md5.copyright
index c37746f4501e..b718bf8b5ebe 100644
--- a/lib/libmd/md5.copyright
+++ b/lib/libmd/md5.copyright
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 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 c1fdc6d864f2..8e25a6a5e8ea 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -22,7 +22,7 @@
  * These notices must be retained in any copies of any part of this
  * documentation and/or software.
  *
- * $Id: md5c.c,v 1.10 1997/10/21 13:28:36 phk Exp $
+ * $FreeBSD$
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3
index 77f4b75f6d8e..ebd8b3048542 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" 	$Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 11, 1999
 .Dt MDX 3
diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c
index ae4b48184be0..0af7892c24ad 100644
--- a/lib/libmd/mdXhl.c
+++ b/lib/libmd/mdXhl.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: mdXhl.c,v 1.11 1997/08/25 05:24:25 joerg Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libmd/mddriver.c b/lib/libmd/mddriver.c
index 3b3421fdb595..e58473c840ed 100644
--- a/lib/libmd/mddriver.c
+++ b/lib/libmd/mddriver.c
@@ -1,5 +1,5 @@
 /* MDDRIVER.C - test driver for MD2, MD4 and MD5
- * $Id: mddriver.c,v 1.4 1997/08/25 05:24:26 joerg Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmd/ripemd.3 b/lib/libmd/ripemd.3
index 7adc02172ebb..12fa3df2f736 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
-.\"	$Id: sha.3,v 1.1 1999/02/26 04:24:56 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 26, 1999
 .Dt RIPEMD 3
diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c
index d174c7fe0df7..c31f9cd242af 100644
--- a/lib/libmd/rmd160c.c
+++ b/lib/libmd/rmd160c.c
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  *
- *	$Id: rmd160c.c,v 1.2 1999/02/26 20:06:46 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libmd/rmddriver.c b/lib/libmd/rmddriver.c
index e2aa0a41dcc0..4278a0f3915c 100644
--- a/lib/libmd/rmddriver.c
+++ b/lib/libmd/rmddriver.c
@@ -1,5 +1,5 @@
 /* RIPEMD160DRIVER.C - test driver for RIPEMD160
- * $Id: RIPEMD160driver.c,v 1.1 1999/02/26 04:24:56 wollman Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmd/sha.3 b/lib/libmd/sha.3
index 8c9bc1c80b5c..5af126d9cd56 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
-.\"	$Id: sha.3,v 1.2 1999/02/26 18:41:45 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 25, 1999
 .Dt SHA 3
diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h
index ed3867d096d0..738033049e0d 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.]
  *
- *	$Id: sha.h,v 1.1 1999/02/26 04:24:56 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SHA_H_
diff --git a/lib/libmd/sha0c.c b/lib/libmd/sha0c.c
index 29e1c78d477c..19c2728b2d3d 100644
--- a/lib/libmd/sha0c.c
+++ b/lib/libmd/sha0c.c
@@ -55,7 +55,7 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  *
- *	$Id: sha0c.c,v 1.1 1999/02/26 04:24:56 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libmd/shadriver.c b/lib/libmd/shadriver.c
index ed3772cecd32..454fac8a810d 100644
--- a/lib/libmd/shadriver.c
+++ b/lib/libmd/shadriver.c
@@ -1,5 +1,5 @@
 /* SHADRIVER.C - test driver for SHA-1 (and SHA-0)
- * $Id: mddriver.c,v 1.4 1997/08/25 05:24:26 joerg Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
diff --git a/lib/libmytinfo/Makefile b/lib/libmytinfo/Makefile
index 700a8827cde9..89eff2bbe3e1 100644
--- a/lib/libmytinfo/Makefile
+++ b/lib/libmytinfo/Makefile
@@ -1,7 +1,7 @@
 # Makefile for libmytinfo
 # Use 'make update_term_h' manually after changing internal
 # mytinfo structures
-# $Id: Makefile,v 1.15 1998/09/02 15:22:11 bde Exp $
+# $FreeBSD$
 
 LIB=    mytinfo
 SRCS=   addstr.c binorder.c buildpath.c caplist.c capsort.c compar.c\
diff --git a/lib/libmytinfo/TESTS/Makefile b/lib/libmytinfo/TESTS/Makefile
index eeaa6d241172..d9b79372988a 100644
--- a/lib/libmytinfo/TESTS/Makefile
+++ b/lib/libmytinfo/TESTS/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libmytinfo tests
-# $Id$
+# $FreeBSD$
 
 LIB=    mytinfo
 
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 949d61759e8d..30886f5866fa 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ncurses
-# $Id: Makefile,v 1.24 1997/10/20 17:53:54 ache Exp $
+# $FreeBSD$
 
 LIB=    ncurses
 SHLIB_MAJOR= 3
diff --git a/lib/libncurses/curs_addch.3 b/lib/libncurses/curs_addch.3
index 5b26e32c42de..f0e72a141c5b 100644
--- a/lib/libncurses/curs_addch.3
+++ b/lib/libncurses/curs_addch.3
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH curs_addch 3 ""
 .SH NAME
diff --git a/lib/libncurses/curs_insstr.3 b/lib/libncurses/curs_insstr.3
index 735dd1b18195..37faf3c28098 100644
--- a/lib/libncurses/curs_insstr.3
+++ b/lib/libncurses/curs_insstr.3
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH curs_insstr 3 ""
 .SH NAME
diff --git a/lib/libncurses/curs_instr.3 b/lib/libncurses/curs_instr.3
index 591ea0e5b673..c03f6c3c4a7c 100644
--- a/lib/libncurses/curs_instr.3
+++ b/lib/libncurses/curs_instr.3
@@ -1,5 +1,5 @@
 .\"
-.\"    $Id$
+.\" $FreeBSD$
 .\"
 .TH curs_instr 3 ""
 .SH NAME
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 6fde25477b37..22b01eb8b72a 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libopie
 #
-# $Id: Makefile,v 1.7 1997/09/29 21:40:17 ache Exp $
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8
index 13184e81ec70..ffaa0748b277 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 2, 1999
 .Dt pam_radius 8
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 36e565087816..1218280ff672 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libpcap
-# $Id: Makefile,v 1.21 1998/09/15 19:34:01 fenner Exp $
+# $FreeBSD$
 
 LIB=    pcap
 SRCS=	grammar.y tokdefs.h pcap-bpf.c \
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index eddc4ba3da66..3cc39fbd862d 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.17 1999/07/05 00:38:12 jasone Exp $
+# $FreeBSD$
 #
 # All library objects contain rcsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
diff --git a/lib/libpthread/arch/alpha/alpha/_atomic_lock.S b/lib/libpthread/arch/alpha/alpha/_atomic_lock.S
index 4a21fdf1abc4..1cfb52faa824 100644
--- a/lib/libpthread/arch/alpha/alpha/_atomic_lock.S
+++ b/lib/libpthread/arch/alpha/alpha/_atomic_lock.S
@@ -19,7 +19,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
  * SUCH DAMAGE.    
  *
- * $Id: _atomic_lock.S,v 1.1 1998/06/09 08:21:55 jb Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libpthread/arch/i386/i386/_atomic_lock.S b/lib/libpthread/arch/i386/i386/_atomic_lock.S
index e0ef0eb6244f..afaec7125ca1 100644
--- a/lib/libpthread/arch/i386/i386/_atomic_lock.S
+++ b/lib/libpthread/arch/i386/i386/_atomic_lock.S
@@ -19,13 +19,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF  
  * SUCH DAMAGE.    
  *
- * $Id: _atomic_lock.S,v 1.1 1998/04/29 09:36:03 jb Exp $
+ * $FreeBSD$
  *
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: _atomic_lock.S,v 1.1 1998/04/29 09:36:03 jb Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 #include "DEFS.h"
diff --git a/lib/libpthread/man/Makefile.inc b/lib/libpthread/man/Makefile.inc
index f92f3df5230e..68129f6139bc 100644
--- a/lib/libpthread/man/Makefile.inc
+++ b/lib/libpthread/man/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.4 1998/07/31 09:09:19 phk Exp $
+# $FreeBSD$
 
 # POSIX thread man files
 
diff --git a/lib/libpthread/man/pthread_cleanup_pop.3 b/lib/libpthread/man/pthread_cleanup_pop.3
index db0547c57736..faae8ba450fc 100644
--- a/lib/libpthread/man/pthread_cleanup_pop.3
+++ b/lib/libpthread/man/pthread_cleanup_pop.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_POP 3
diff --git a/lib/libpthread/man/pthread_cleanup_push.3 b/lib/libpthread/man/pthread_cleanup_push.3
index cf6682363647..4f260affbc32 100644
--- a/lib/libpthread/man/pthread_cleanup_push.3
+++ b/lib/libpthread/man/pthread_cleanup_push.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_CLEANUP_PUSH 3
diff --git a/lib/libpthread/man/pthread_cond_broadcast.3 b/lib/libpthread/man/pthread_cond_broadcast.3
index dbaaa851a548..6112695c9893 100644
--- a/lib/libpthread/man/pthread_cond_broadcast.3
+++ b/lib/libpthread/man/pthread_cond_broadcast.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_BROADCAST 3
diff --git a/lib/libpthread/man/pthread_cond_destroy.3 b/lib/libpthread/man/pthread_cond_destroy.3
index 3efe8b61afa9..75ae99686f41 100644
--- a/lib/libpthread/man/pthread_cond_destroy.3
+++ b/lib/libpthread/man/pthread_cond_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_DESTROY 3
diff --git a/lib/libpthread/man/pthread_cond_init.3 b/lib/libpthread/man/pthread_cond_init.3
index 1a9415500dc8..2783672ce3d9 100644
--- a/lib/libpthread/man/pthread_cond_init.3
+++ b/lib/libpthread/man/pthread_cond_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_INIT 3
diff --git a/lib/libpthread/man/pthread_cond_signal.3 b/lib/libpthread/man/pthread_cond_signal.3
index 574862ec3104..e3a22f88cf6c 100644
--- a/lib/libpthread/man/pthread_cond_signal.3
+++ b/lib/libpthread/man/pthread_cond_signal.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_SIGNAL 3
diff --git a/lib/libpthread/man/pthread_cond_timedwait.3 b/lib/libpthread/man/pthread_cond_timedwait.3
index 6af8430dd2f2..de427f8d4c0a 100644
--- a/lib/libpthread/man/pthread_cond_timedwait.3
+++ b/lib/libpthread/man/pthread_cond_timedwait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: pthread_cond_timedwait.3,v 1.4 1999/07/12 20:49:03 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_TIMEDWAIT 3
diff --git a/lib/libpthread/man/pthread_cond_wait.3 b/lib/libpthread/man/pthread_cond_wait.3
index 9d6294f2715c..435cd41f2be6 100644
--- a/lib/libpthread/man/pthread_cond_wait.3
+++ b/lib/libpthread/man/pthread_cond_wait.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: pthread_cond_wait.3,v 1.4 1999/07/12 20:49:05 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_WAIT 3
diff --git a/lib/libpthread/man/pthread_create.3 b/lib/libpthread/man/pthread_create.3
index 3342296db8d3..cdc28a56c854 100644
--- a/lib/libpthread/man/pthread_create.3
+++ b/lib/libpthread/man/pthread_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_CREATE 3
diff --git a/lib/libpthread/man/pthread_detach.3 b/lib/libpthread/man/pthread_detach.3
index 34797a25b643..a3fffc6056ea 100644
--- a/lib/libpthread/man/pthread_detach.3
+++ b/lib/libpthread/man/pthread_detach.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_DETACH 3
diff --git a/lib/libpthread/man/pthread_equal.3 b/lib/libpthread/man/pthread_equal.3
index cb158682c74e..5d443b3cb2c6 100644
--- a/lib/libpthread/man/pthread_equal.3
+++ b/lib/libpthread/man/pthread_equal.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EQUAL 3
diff --git a/lib/libpthread/man/pthread_exit.3 b/lib/libpthread/man/pthread_exit.3
index 4fbf4a64611a..ff452ca94215 100644
--- a/lib/libpthread/man/pthread_exit.3
+++ b/lib/libpthread/man/pthread_exit.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: pthread_exit.3,v 1.5 1999/07/12 20:49:07 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EXIT 3
diff --git a/lib/libpthread/man/pthread_getspecific.3 b/lib/libpthread/man/pthread_getspecific.3
index b7875fbdb846..a56254108f6e 100644
--- a/lib/libpthread/man/pthread_getspecific.3
+++ b/lib/libpthread/man/pthread_getspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_getspecific.3,v 1.4 1997/02/22 15:05:24 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_GETSPECIFIC 3
diff --git a/lib/libpthread/man/pthread_join.3 b/lib/libpthread/man/pthread_join.3
index d677aa10d915..e32ad40613b7 100644
--- a/lib/libpthread/man/pthread_join.3
+++ b/lib/libpthread/man/pthread_join.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_JOIN 3
diff --git a/lib/libpthread/man/pthread_key_create.3 b/lib/libpthread/man/pthread_key_create.3
index 6327b92eb315..76fc1879326c 100644
--- a/lib/libpthread/man/pthread_key_create.3
+++ b/lib/libpthread/man/pthread_key_create.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_CREATE 3
diff --git a/lib/libpthread/man/pthread_key_delete.3 b/lib/libpthread/man/pthread_key_delete.3
index 4328e29b5061..39fb19ea9af8 100644
--- a/lib/libpthread/man/pthread_key_delete.3
+++ b/lib/libpthread/man/pthread_key_delete.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_DELETE 3
diff --git a/lib/libpthread/man/pthread_mutex_destroy.3 b/lib/libpthread/man/pthread_mutex_destroy.3
index fa4fdc31d7e8..517d6ebadf5d 100644
--- a/lib/libpthread/man/pthread_mutex_destroy.3
+++ b/lib/libpthread/man/pthread_mutex_destroy.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_DESTROY 3
diff --git a/lib/libpthread/man/pthread_mutex_init.3 b/lib/libpthread/man/pthread_mutex_init.3
index 07c9e91852e1..926b034b6011 100644
--- a/lib/libpthread/man/pthread_mutex_init.3
+++ b/lib/libpthread/man/pthread_mutex_init.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_INIT 3
diff --git a/lib/libpthread/man/pthread_mutex_lock.3 b/lib/libpthread/man/pthread_mutex_lock.3
index 6e7901db7c23..36473733ce11 100644
--- a/lib/libpthread/man/pthread_mutex_lock.3
+++ b/lib/libpthread/man/pthread_mutex_lock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_LOCK 3
diff --git a/lib/libpthread/man/pthread_mutex_trylock.3 b/lib/libpthread/man/pthread_mutex_trylock.3
index 6fef180bb966..30faaa81bd4d 100644
--- a/lib/libpthread/man/pthread_mutex_trylock.3
+++ b/lib/libpthread/man/pthread_mutex_trylock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_TRYLOCK 3
diff --git a/lib/libpthread/man/pthread_mutex_unlock.3 b/lib/libpthread/man/pthread_mutex_unlock.3
index cebfbd50dc6d..27a4c337fe37 100644
--- a/lib/libpthread/man/pthread_mutex_unlock.3
+++ b/lib/libpthread/man/pthread_mutex_unlock.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_UNLOCK 3
diff --git a/lib/libpthread/man/pthread_once.3 b/lib/libpthread/man/pthread_once.3
index 27130bcef349..2dcea493cb9c 100644
--- a/lib/libpthread/man/pthread_once.3
+++ b/lib/libpthread/man/pthread_once.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_ONCE 3
diff --git a/lib/libpthread/man/pthread_rwlock_destroy.3 b/lib/libpthread/man/pthread_rwlock_destroy.3
index b67a2e7beb0d..14691c44bbf8 100644
--- a/lib/libpthread/man/pthread_rwlock_destroy.3
+++ b/lib/libpthread/man/pthread_rwlock_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_rwlock_destroy.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_DESTROY 3
diff --git a/lib/libpthread/man/pthread_rwlock_init.3 b/lib/libpthread/man/pthread_rwlock_init.3
index a56169507b48..306af61bbeb4 100644
--- a/lib/libpthread/man/pthread_rwlock_init.3
+++ b/lib/libpthread/man/pthread_rwlock_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_INIT 3
diff --git a/lib/libpthread/man/pthread_rwlock_rdlock.3 b/lib/libpthread/man/pthread_rwlock_rdlock.3
index 9181be96cd5d..bea219de0100 100644
--- a/lib/libpthread/man/pthread_rwlock_rdlock.3
+++ b/lib/libpthread/man/pthread_rwlock_rdlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_RDLOCK 3
diff --git a/lib/libpthread/man/pthread_rwlock_unlock.3 b/lib/libpthread/man/pthread_rwlock_unlock.3
index 1c9fd05797ad..7ad52b257120 100644
--- a/lib/libpthread/man/pthread_rwlock_unlock.3
+++ b/lib/libpthread/man/pthread_rwlock_unlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_UNLOCK 3
diff --git a/lib/libpthread/man/pthread_rwlock_wrlock.3 b/lib/libpthread/man/pthread_rwlock_wrlock.3
index a5a367406566..b6a2312a79d6 100644
--- a/lib/libpthread/man/pthread_rwlock_wrlock.3
+++ b/lib/libpthread/man/pthread_rwlock_wrlock.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_WRLOCK 3
diff --git a/lib/libpthread/man/pthread_rwlockattr_destroy.3 b/lib/libpthread/man/pthread_rwlockattr_destroy.3
index 35ac21719e97..2d67041ba161 100644
--- a/lib/libpthread/man/pthread_rwlockattr_destroy.3
+++ b/lib/libpthread/man/pthread_rwlockattr_destroy.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_rwlockattr_destroy.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_DESTROY 3
diff --git a/lib/libpthread/man/pthread_rwlockattr_getpshared.3 b/lib/libpthread/man/pthread_rwlockattr_getpshared.3
index 4b8d9937104d..d2028dc58c6d 100644
--- a/lib/libpthread/man/pthread_rwlockattr_getpshared.3
+++ b/lib/libpthread/man/pthread_rwlockattr_getpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_rwlockattr_getpshared.3,v 1.2 1999/03/05 18:43:00 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 22, 1999
 .Dt PTHREAD_RWLOCKATTR_GETPSHARED 3
diff --git a/lib/libpthread/man/pthread_rwlockattr_init.3 b/lib/libpthread/man/pthread_rwlockattr_init.3
index 54bbedce2cab..ac191260c66d 100644
--- a/lib/libpthread/man/pthread_rwlockattr_init.3
+++ b/lib/libpthread/man/pthread_rwlockattr_init.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pthread_rwlockattr_init.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_INIT 3
diff --git a/lib/libpthread/man/pthread_rwlockattr_setpshared.3 b/lib/libpthread/man/pthread_rwlockattr_setpshared.3
index e63debfc400b..b98e081aa3a7 100644
--- a/lib/libpthread/man/pthread_rwlockattr_setpshared.3
+++ b/lib/libpthread/man/pthread_rwlockattr_setpshared.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3
diff --git a/lib/libpthread/man/pthread_self.3 b/lib/libpthread/man/pthread_self.3
index ef1d88d88b68..be524b9345b9 100644
--- a/lib/libpthread/man/pthread_self.3
+++ b/lib/libpthread/man/pthread_self.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SELF 3
diff --git a/lib/libpthread/man/pthread_setspecific.3 b/lib/libpthread/man/pthread_setspecific.3
index c8e2b1a529e8..89a416f57c61 100644
--- a/lib/libpthread/man/pthread_setspecific.3
+++ b/lib/libpthread/man/pthread_setspecific.3
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SETSPECIFIC 3
diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc
index 50952cdfad1a..e608afa69909 100644
--- a/lib/libpthread/sys/Makefile.inc
+++ b/lib/libpthread/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.8 1998/04/29 11:03:34 jb Exp $
+# $FreeBSD$
 
 .PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}
 
diff --git a/lib/libpthread/sys/thr_error.c b/lib/libpthread/sys/thr_error.c
index 9f9e1a514cd8..0d08ae83729a 100644
--- a/lib/libpthread/sys/thr_error.c
+++ b/lib/libpthread/sys/thr_error.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libpthread/test/Makefile b/lib/libpthread/test/Makefile
index c39497945f06..90ee5ad59ea4 100644
--- a/lib/libpthread/test/Makefile
+++ b/lib/libpthread/test/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/09/30 07:07:59 jb Exp $
+# $FreeBSD$
 #
 # Tests for libc_r functionality.
 #
diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc
index 22e954861e03..d42c04b1c871 100644
--- a/lib/libpthread/thread/Makefile.inc
+++ b/lib/libpthread/thread/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.17 1999/03/23 05:07:54 jb Exp $
+# $FreeBSD$
 
 # uthread sources
 .PATH: ${.CURDIR}/uthread
diff --git a/lib/libpthread/thread/thr_attr_destroy.c b/lib/libpthread/thread/thr_attr_destroy.c
index e972d5f24813..dfe668ea2181 100644
--- a/lib/libpthread/thread/thr_attr_destroy.c
+++ b/lib/libpthread/thread/thr_attr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_attr_getdetachstate.c b/lib/libpthread/thread/thr_attr_getdetachstate.c
index 8a986b3c8977..fee1e8b11a2a 100644
--- a/lib/libpthread/thread/thr_attr_getdetachstate.c
+++ b/lib/libpthread/thread/thr_attr_getdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_getinheritsched.c b/lib/libpthread/thread/thr_attr_getinheritsched.c
index 5cf5b63cb724..f98fde7fac83 100644
--- a/lib/libpthread/thread/thr_attr_getinheritsched.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_getschedparam.c b/lib/libpthread/thread/thr_attr_getschedparam.c
index bac609fda8ca..61c68913de2f 100644
--- a/lib/libpthread/thread/thr_attr_getschedparam.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_getschedpolicy.c b/lib/libpthread/thread/thr_attr_getschedpolicy.c
index 5248780c5d01..6ebc76492653 100644
--- a/lib/libpthread/thread/thr_attr_getschedpolicy.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_getscope.c b/lib/libpthread/thread/thr_attr_getscope.c
index e62cc4182d72..f456585af966 100644
--- a/lib/libpthread/thread/thr_attr_getscope.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_getstackaddr.c b/lib/libpthread/thread/thr_attr_getstackaddr.c
index 78f0d429e577..1fee4a5f8717 100644
--- a/lib/libpthread/thread/thr_attr_getstackaddr.c
+++ b/lib/libpthread/thread/thr_attr_getstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_getstacksize.c b/lib/libpthread/thread/thr_attr_getstacksize.c
index a5989b53ec4d..5c7a9e071359 100644
--- a/lib/libpthread/thread/thr_attr_getstacksize.c
+++ b/lib/libpthread/thread/thr_attr_getstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_init.c b/lib/libpthread/thread/thr_attr_init.c
index 6233d737324c..dbe3091b0ab2 100644
--- a/lib/libpthread/thread/thr_attr_init.c
+++ b/lib/libpthread/thread/thr_attr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c b/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c
index 311ff27d2e63..d230397f743f 100644
--- a/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c
+++ b/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_setdetachstate.c b/lib/libpthread/thread/thr_attr_setdetachstate.c
index f0c58ecccbd8..36a846a34abf 100644
--- a/lib/libpthread/thread/thr_attr_setdetachstate.c
+++ b/lib/libpthread/thread/thr_attr_setdetachstate.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_setinheritsched.c b/lib/libpthread/thread/thr_attr_setinheritsched.c
index 06335235caa7..eb2384b8fc2b 100644
--- a/lib/libpthread/thread/thr_attr_setinheritsched.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_setschedparam.c b/lib/libpthread/thread/thr_attr_setschedparam.c
index 0846c651008d..17b93b4ec523 100644
--- a/lib/libpthread/thread/thr_attr_setschedparam.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_setschedpolicy.c b/lib/libpthread/thread/thr_attr_setschedpolicy.c
index 36fac6f45342..640cb38f0b06 100644
--- a/lib/libpthread/thread/thr_attr_setschedpolicy.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_setscope.c b/lib/libpthread/thread/thr_attr_setscope.c
index 70ac8bb7d193..84239d7f6613 100644
--- a/lib/libpthread/thread/thr_attr_setscope.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_setstackaddr.c b/lib/libpthread/thread/thr_attr_setstackaddr.c
index 58686ca32266..7eb8c5d1319c 100644
--- a/lib/libpthread/thread/thr_attr_setstackaddr.c
+++ b/lib/libpthread/thread/thr_attr_setstackaddr.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_attr_setstacksize.c b/lib/libpthread/thread/thr_attr_setstacksize.c
index cf306d27c795..2a2d85482e0a 100644
--- a/lib/libpthread/thread/thr_attr_setstacksize.c
+++ b/lib/libpthread/thread/thr_attr_setstacksize.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_clean.c b/lib/libpthread/thread/thr_clean.c
index 496858b75942..bba5500c8fe7 100644
--- a/lib/libpthread/thread/thr_clean.c
+++ b/lib/libpthread/thread/thr_clean.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_close.c b/lib/libpthread/thread/thr_close.c
index 6799832ee488..9eba4332f060 100644
--- a/lib/libpthread/thread/thr_close.c
+++ b/lib/libpthread/thread/thr_close.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_close.c,v 1.5 1999/06/20 08:28:11 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c
index 4d52c631dcdc..079a635f8de5 100644
--- a/lib/libpthread/thread/thr_cond.c
+++ b/lib/libpthread/thread/thr_cond.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_cond.c,v 1.15 1999/06/20 08:28:13 jb Exp $
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_condattr_destroy.c b/lib/libpthread/thread/thr_condattr_destroy.c
index 2ea3ce75d5f0..ad91228c3050 100644
--- a/lib/libpthread/thread/thr_condattr_destroy.c
+++ b/lib/libpthread/thread/thr_condattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_condattr_init.c b/lib/libpthread/thread/thr_condattr_init.c
index 9d9b610cb967..33798982f330 100644
--- a/lib/libpthread/thread/thr_condattr_init.c
+++ b/lib/libpthread/thread/thr_condattr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_create.c b/lib/libpthread/thread/thr_create.c
index 25cf2b0640fb..b3ea39124a7c 100644
--- a/lib/libpthread/thread/thr_create.c
+++ b/lib/libpthread/thread/thr_create.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_create.c,v 1.17 1999/07/11 06:06:52 jasone Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_detach.c b/lib/libpthread/thread/thr_detach.c
index 7f24abb8ff18..164c7dfe54e1 100644
--- a/lib/libpthread/thread/thr_detach.c
+++ b/lib/libpthread/thread/thr_detach.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_detach.c,v 1.8 1999/06/20 08:28:15 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_equal.c b/lib/libpthread/thread/thr_equal.c
index 690a55aa4e45..e03ba4afe445 100644
--- a/lib/libpthread/thread/thr_equal.c
+++ b/lib/libpthread/thread/thr_equal.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_exit.c b/lib/libpthread/thread/thr_exit.c
index 6ff4f334beac..c9894435748d 100644
--- a/lib/libpthread/thread/thr_exit.c
+++ b/lib/libpthread/thread/thr_exit.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_exit.c,v 1.9 1999/06/20 08:28:17 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/libpthread/thread/thr_fcntl.c b/lib/libpthread/thread/thr_fcntl.c
index 485ed4374c7d..9a6293c5e3c8 100644
--- a/lib/libpthread/thread/thr_fcntl.c
+++ b/lib/libpthread/thread/thr_fcntl.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdarg.h>
 #include <unistd.h>
diff --git a/lib/libpthread/thread/thr_find_thread.c b/lib/libpthread/thread/thr_find_thread.c
index 6fc94457f2a5..d4a3bbd1162d 100644
--- a/lib/libpthread/thread/thr_find_thread.c
+++ b/lib/libpthread/thread/thr_find_thread.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_find_thread.c,v 1.3 1999/06/20 08:28:22 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_fork.c b/lib/libpthread/thread/thr_fork.c
index f2e352c210dd..93d4a6869e5d 100644
--- a/lib/libpthread/thread/thr_fork.c
+++ b/lib/libpthread/thread/thr_fork.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_fork.c,v 1.11 1999/08/05 12:15:11 deischen Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <string.h>
diff --git a/lib/libpthread/thread/thr_fsync.c b/lib/libpthread/thread/thr_fsync.c
index 93de8c8e98a3..3287edda8274 100644
--- a/lib/libpthread/thread/thr_fsync.c
+++ b/lib/libpthread/thread/thr_fsync.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <unistd.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_gc.c b/lib/libpthread/thread/thr_gc.c
index f2f216b7798f..d748049a5158 100644
--- a/lib/libpthread/thread/thr_gc.c
+++ b/lib/libpthread/thread/thr_gc.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: uthread_gc.c,v 1.8 1999/07/11 06:06:52 jasone Exp $
+ * $FreeBSD$
  *
  * Garbage collector thread. Frees memory allocated for dead threads.
  *
diff --git a/lib/libpthread/thread/thr_getprio.c b/lib/libpthread/thread/thr_getprio.c
index 0ec97061d9ef..2f94b86b64af 100644
--- a/lib/libpthread/thread/thr_getprio.c
+++ b/lib/libpthread/thread/thr_getprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_getschedparam.c b/lib/libpthread/thread/thr_getschedparam.c
index 7642f5812908..b6c0c35c7bb6 100644
--- a/lib/libpthread/thread/thr_getschedparam.c
+++ b/lib/libpthread/thread/thr_getschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_info.c b/lib/libpthread/thread/thr_info.c
index d005bab50a80..ed4a58db4647 100644
--- a/lib/libpthread/thread/thr_info.c
+++ b/lib/libpthread/thread/thr_info.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_info.c,v 1.11 1999/06/20 08:28:26 jb Exp $
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/lib/libpthread/thread/thr_init.c b/lib/libpthread/thread/thr_init.c
index c80427a73420..a2ce49331899 100644
--- a/lib/libpthread/thread/thr_init.c
+++ b/lib/libpthread/thread/thr_init.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_init.c,v 1.16 1999/07/12 16:09:30 dt Exp $
+ * $FreeBSD$
  */
 
 /* Allocate space for global thread variables here: */
diff --git a/lib/libpthread/thread/thr_join.c b/lib/libpthread/thread/thr_join.c
index e3d6c483669c..8b000825b207 100644
--- a/lib/libpthread/thread/thr_join.c
+++ b/lib/libpthread/thread/thr_join.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_join.c,v 1.7 1999/06/20 08:28:29 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_kern.c b/lib/libpthread/thread/thr_kern.c
index c0e4a5de212c..3331a5df0bc7 100644
--- a/lib/libpthread/thread/thr_kern.c
+++ b/lib/libpthread/thread/thr_kern.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_kern.c,v 1.20 1999/08/12 19:34:39 deischen Exp $
+ * $FreeBSD$
  *
  */
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_kill.c b/lib/libpthread/thread/thr_kill.c
index fd43a10536a6..6b25550330a9 100644
--- a/lib/libpthread/thread/thr_kill.c
+++ b/lib/libpthread/thread/thr_kill.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_kill.c,v 1.7 1999/06/20 08:28:32 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libpthread/thread/thr_mattr_init.c b/lib/libpthread/thread/thr_mattr_init.c
index c65c87ab70a5..63d4401f2553 100644
--- a/lib/libpthread/thread/thr_mattr_init.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_mattr_kind_np.c b/lib/libpthread/thread/thr_mattr_kind_np.c
index 5a1dcd81c74c..8b3b8cbafaf5 100644
--- a/lib/libpthread/thread/thr_mattr_kind_np.c
+++ b/lib/libpthread/thread/thr_mattr_kind_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_multi_np.c b/lib/libpthread/thread/thr_multi_np.c
index 421d2a4252fe..39dd948cbc4f 100644
--- a/lib/libpthread/thread/thr_multi_np.c
+++ b/lib/libpthread/thread/thr_multi_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c
index c967b4698154..a402d4bc2159 100644
--- a/lib/libpthread/thread/thr_mutex.c
+++ b/lib/libpthread/thread/thr_mutex.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_mutex_prioceiling.c b/lib/libpthread/thread/thr_mutex_prioceiling.c
index 5effb8ad495d..c193c82a9c80 100644
--- a/lib/libpthread/thread/thr_mutex_prioceiling.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_mutex_protocol.c b/lib/libpthread/thread/thr_mutex_protocol.c
index 7b86e5bb0756..9847ae529eb8 100644
--- a/lib/libpthread/thread/thr_mutex_protocol.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_mutexattr_destroy.c b/lib/libpthread/thread/thr_mutexattr_destroy.c
index 376f538440b7..9afebad917d2 100644
--- a/lib/libpthread/thread/thr_mutexattr_destroy.c
+++ b/lib/libpthread/thread/thr_mutexattr_destroy.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_nanosleep.c b/lib/libpthread/thread/thr_nanosleep.c
index 41488ffae554..a922040d2faf 100644
--- a/lib/libpthread/thread/thr_nanosleep.c
+++ b/lib/libpthread/thread/thr_nanosleep.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_nanosleep.c,v 1.8 1999/08/19 23:06:10 alfred Exp $
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_once.c b/lib/libpthread/thread/thr_once.c
index 3f99778e21a7..ea56d82c4d83 100644
--- a/lib/libpthread/thread/thr_once.c
+++ b/lib/libpthread/thread/thr_once.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_open.c b/lib/libpthread/thread/thr_open.c
index 766bc283b50e..2f30ae727c53 100644
--- a/lib/libpthread/thread/thr_open.c
+++ b/lib/libpthread/thread/thr_open.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_open.c,v 1.4 1998/04/29 09:59:07 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <stdarg.h>
diff --git a/lib/libpthread/thread/thr_poll.c b/lib/libpthread/thread/thr_poll.c
index 2acd725dea5f..4967e6c78afd 100644
--- a/lib/libpthread/thread/thr_poll.c
+++ b/lib/libpthread/thread/thr_poll.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_poll.c,v 1.1 1999/06/20 08:28:36 jb Exp $
+ * $FreeBSD$
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_priority_queue.c b/lib/libpthread/thread/thr_priority_queue.c
index 0a00a9d3dc50..5bd8a8cc2826 100644
--- a/lib/libpthread/thread/thr_priority_queue.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <stdlib.h>
 #include <sys/queue.h>
diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h
index 65203d5c8fad..c6c1100522c0 100644
--- a/lib/libpthread/thread/thr_private.h
+++ b/lib/libpthread/thread/thr_private.h
@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $Id: pthread_private.h,v 1.24 1999/07/12 16:09:30 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PTHREAD_PRIVATE_H
diff --git a/lib/libpthread/thread/thr_read.c b/lib/libpthread/thread/thr_read.c
index b2da6559f919..0376827b1c59 100644
--- a/lib/libpthread/thread/thr_read.c
+++ b/lib/libpthread/thread/thr_read.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_read.c,v 1.6 1998/06/10 22:28:43 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_readv.c b/lib/libpthread/thread/thr_readv.c
index cbf5b451c6a7..a1a862d42490 100644
--- a/lib/libpthread/thread/thr_readv.c
+++ b/lib/libpthread/thread/thr_readv.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_readv.c,v 1.6 1998/06/10 22:28:44 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_resume_np.c b/lib/libpthread/thread/thr_resume_np.c
index e83dcc76d3bf..98ec7186d8f9 100644
--- a/lib/libpthread/thread/thr_resume_np.c
+++ b/lib/libpthread/thread/thr_resume_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_resume_np.c,v 1.5 1999/06/20 08:28:40 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_rwlock.c b/lib/libpthread/thread/thr_rwlock.c
index f398a1857d4a..648e8a394eeb 100644
--- a/lib/libpthread/thread/thr_rwlock.c
+++ b/lib/libpthread/thread/thr_rwlock.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: uthread_rwlock.c,v 1.2 1998/09/07 19:23:55 alex Exp $
+ * $FreeBSD$
  */
 
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_rwlockattr.c b/lib/libpthread/thread/thr_rwlockattr.c
index 50b128b92807..3330ba19ff3e 100644
--- a/lib/libpthread/thread/thr_rwlockattr.c
+++ b/lib/libpthread/thread/thr_rwlockattr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: uthread_rwlockattr.c,v 1.1 1998/09/07 19:01:43 alex Exp $
+ * $FreeBSD$
  */
 
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_select.c b/lib/libpthread/thread/thr_select.c
index 217916003f7f..a7ea8cfabcd7 100644
--- a/lib/libpthread/thread/thr_select.c
+++ b/lib/libpthread/thread/thr_select.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_select.c,v 1.10 1999/08/19 23:06:11 alfred Exp $
+ * $FreeBSD$
  */
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_self.c b/lib/libpthread/thread/thr_self.c
index e6e11e446731..81ec427a3f04 100644
--- a/lib/libpthread/thread/thr_self.c
+++ b/lib/libpthread/thread/thr_self.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_seterrno.c b/lib/libpthread/thread/thr_seterrno.c
index 445d2600a1a6..1934aac7222a 100644
--- a/lib/libpthread/thread/thr_seterrno.c
+++ b/lib/libpthread/thread/thr_seterrno.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libpthread/thread/thr_setprio.c b/lib/libpthread/thread/thr_setprio.c
index 3ef2df0eb1ae..5f7b44ad31e5 100644
--- a/lib/libpthread/thread/thr_setprio.c
+++ b/lib/libpthread/thread/thr_setprio.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_setschedparam.c b/lib/libpthread/thread/thr_setschedparam.c
index 1ba0e207275e..bb66fe50ba67 100644
--- a/lib/libpthread/thread/thr_setschedparam.c
+++ b/lib/libpthread/thread/thr_setschedparam.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <sys/param.h>
diff --git a/lib/libpthread/thread/thr_sig.c b/lib/libpthread/thread/thr_sig.c
index 17a3a959cf27..b6aad9ce7e67 100644
--- a/lib/libpthread/thread/thr_sig.c
+++ b/lib/libpthread/thread/thr_sig.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sig.c,v 1.17 1999/06/20 08:28:44 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <fcntl.h>
diff --git a/lib/libpthread/thread/thr_sigaction.c b/lib/libpthread/thread/thr_sigaction.c
index c5640d73cd66..7fa8ebff330d 100644
--- a/lib/libpthread/thread/thr_sigaction.c
+++ b/lib/libpthread/thread/thr_sigaction.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sigaction.c,v 1.6 1999/06/20 08:28:46 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_sigmask.c b/lib/libpthread/thread/thr_sigmask.c
index 037ae1cb3d88..514f8fa750e5 100644
--- a/lib/libpthread/thread/thr_sigmask.c
+++ b/lib/libpthread/thread/thr_sigmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <signal.h>
diff --git a/lib/libpthread/thread/thr_sigpending.c b/lib/libpthread/thread/thr_sigpending.c
index 28305d3f1b01..2d61e2104788 100644
--- a/lib/libpthread/thread/thr_sigpending.c
+++ b/lib/libpthread/thread/thr_sigpending.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_sigprocmask.c b/lib/libpthread/thread/thr_sigprocmask.c
index a80d8f9bdbd2..945592202fb4 100644
--- a/lib/libpthread/thread/thr_sigprocmask.c
+++ b/lib/libpthread/thread/thr_sigprocmask.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_sigsuspend.c b/lib/libpthread/thread/thr_sigsuspend.c
index bbf7380f7f68..ac06ff71ba46 100644
--- a/lib/libpthread/thread/thr_sigsuspend.c
+++ b/lib/libpthread/thread/thr_sigsuspend.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_sigwait.c b/lib/libpthread/thread/thr_sigwait.c
index e044a6468f5a..7257b7e794cc 100644
--- a/lib/libpthread/thread/thr_sigwait.c
+++ b/lib/libpthread/thread/thr_sigwait.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_sigwait.c,v 1.6 1999/06/20 08:28:47 jb Exp $
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <errno.h>
diff --git a/lib/libpthread/thread/thr_single_np.c b/lib/libpthread/thread/thr_single_np.c
index 12674d2cbca6..d6ecb48b4259 100644
--- a/lib/libpthread/thread/thr_single_np.c
+++ b/lib/libpthread/thread/thr_single_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <string.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_spec.c b/lib/libpthread/thread/thr_spec.c
index d54bd892f116..f1e9f5c08a9b 100644
--- a/lib/libpthread/thread/thr_spec.c
+++ b/lib/libpthread/thread/thr_spec.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <signal.h>
 #include <stdlib.h>
diff --git a/lib/libpthread/thread/thr_spinlock.c b/lib/libpthread/thread/thr_spinlock.c
index d84cf3143b20..4e94ffcb3e0f 100644
--- a/lib/libpthread/thread/thr_spinlock.c
+++ b/lib/libpthread/thread/thr_spinlock.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_spinlock.c,v 1.5 1999/03/23 05:07:56 jb Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libpthread/thread/thr_suspend_np.c b/lib/libpthread/thread/thr_suspend_np.c
index b83057d2ad92..ea9b1f857af5 100644
--- a/lib/libpthread/thread/thr_suspend_np.c
+++ b/lib/libpthread/thread/thr_suspend_np.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_suspend_np.c,v 1.5 1999/06/20 08:28:48 jb Exp $
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_switch_np.c b/lib/libpthread/thread/thr_switch_np.c
index 8e5721e5a036..9b83545fdd7e 100644
--- a/lib/libpthread/thread/thr_switch_np.c
+++ b/lib/libpthread/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.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #ifdef _THREAD_SAFE
diff --git a/lib/libpthread/thread/thr_wait4.c b/lib/libpthread/thread/thr_wait4.c
index 64394f8978a9..fc6cfba69f1e 100644
--- a/lib/libpthread/thread/thr_wait4.c
+++ b/lib/libpthread/thread/thr_wait4.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #include <errno.h>
 #include <sys/wait.h>
diff --git a/lib/libpthread/thread/thr_write.c b/lib/libpthread/thread/thr_write.c
index f94623b633ae..9292add9027e 100644
--- a/lib/libpthread/thread/thr_write.c
+++ b/lib/libpthread/thread/thr_write.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_write.c,v 1.10 1998/09/07 21:55:01 alex Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_writev.c b/lib/libpthread/thread/thr_writev.c
index aad77fea19e6..8ca5db7d8264 100644
--- a/lib/libpthread/thread/thr_writev.c
+++ b/lib/libpthread/thread/thr_writev.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uthread_writev.c,v 1.10 1998/06/14 09:36:14 jb Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/types.h>
diff --git a/lib/libpthread/thread/thr_yield.c b/lib/libpthread/thread/thr_yield.c
index 7b388427c2f8..064dd826d34c 100644
--- a/lib/libpthread/thread/thr_yield.c
+++ b/lib/libpthread/thread/thr_yield.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifdef _THREAD_SAFE
 #include <pthread.h>
diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index ad164f3053aa..15e68519faf3 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1998
 .Dt LIBRADIUS 3
diff --git a/lib/libradius/radius.conf.5 b/lib/libradius/radius.conf.5
index ff4675dc9fbb..5c0143934e6e 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1998
 .Dt RADIUS.CONF 5
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 33efab7da83e..077a33eadc69 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile    5.10 (Berkeley) 6/24/90
-#	$Id: Makefile,v 1.11 1998/02/25 01:30:05 bde Exp $
+# $FreeBSD$
 
 .PATH: ${DESTDIR}/usr/include/rpcsvc
 
diff --git a/lib/librpcsvc/xcrypt.c b/lib/librpcsvc/xcrypt.c
index 3635bd8259ad..f2b54a54e57c 100644
--- a/lib/librpcsvc/xcrypt.c
+++ b/lib/librpcsvc/xcrypt.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 /*from: static char sccsid[] = "@(#)xcrypt.c	2.2 88/08/10 4.0 RPCSRC"; */
-static const char rcsid[] = "$Id: xcrypt.c,v 1.1 1996/11/12 02:36:12 wpaul Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 static char hex[];	/* forward */
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index 253291a63f9a..f3d42b7154d8 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: yp_passwd.c,v 1.1 1996/11/16 20:52:13 wpaul Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
@@ -40,7 +40,7 @@
 #include <netinet/in.h>
 
 #ifndef LINT
-static const char rcsid[] = "$Id: yp_passwd.c,v 1.1 1996/11/16 20:52:13 wpaul Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index cbaa0fd73433..ba49c0ce7b0d 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$Id: yp_update.c,v 1.1 1996/11/16 20:54:57 wpaul Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
@@ -46,7 +46,7 @@
 #include <rpc/key_prot.h>
 
 #ifndef lint
-static const char rcsid[] = "$Id: yp_update.c,v 1.1 1996/11/16 20:54:57 wpaul Exp $";
+static const char rcsid[] = "$FreeBSD$";
 #endif
 
 #ifndef WINDOW
diff --git a/lib/libskey/pathnames.h b/lib/libskey/pathnames.h
index 84f0d3203b7b..ca91fccd9e6d 100644
--- a/lib/libskey/pathnames.h
+++ b/lib/libskey/pathnames.h
@@ -1,4 +1,4 @@
-/* $Id$ (FreeBSD) */
+/* $FreeBSD$ (FreeBSD) */
 
 #include <paths.h>
 
diff --git a/lib/libskey/skey.1 b/lib/libskey/skey.1
index b4d92319b2b3..6038d612ba1f 100644
--- a/lib/libskey/skey.1
+++ b/lib/libskey/skey.1
@@ -1,7 +1,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)skey.1	1.1 	10/28/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .lt 6.0i
 .TH KEY 1 "28 October 1993"
diff --git a/lib/libskey/skey.3 b/lib/libskey/skey.3
index a93fad3e16b5..060fc7d8c4c3 100644
--- a/lib/libskey/skey.3
+++ b/lib/libskey/skey.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: skey.3,v 1.8 1998/08/05 23:42:10 jdp Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 22, 1996
 .Dt SKEY 3
diff --git a/lib/libss/Makefile b/lib/libss/Makefile
index 90162747379c..9638585124e1 100644
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.19 1998/03/06 13:44:12 bde Exp $
+# $FreeBSD$
 
 LIB=	ss
 SRCS=	data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 81ec4890ec7c..3e2aef4ace49 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 1999/02/12 17:20:10 dcs Exp $
+# $FreeBSD$
 #
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
diff --git a/lib/libstand/assert.c b/lib/libstand/assert.c
index 1ca15f86be95..48115284221c 100644
--- a/lib/libstand/assert.c
+++ b/lib/libstand/assert.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/lib/libstand/environment.c b/lib/libstand/environment.c
index 72a9e06e5e80..f2ca120a177d 100644
--- a/lib/libstand/environment.c
+++ b/lib/libstand/environment.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: environment.c,v 1.1.1.1 1998/08/20 08:19:55 msmith Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libstand/gzipfs.c b/lib/libstand/gzipfs.c
index fb64665cc3a2..b0e30073cd7e 100644
--- a/lib/libstand/gzipfs.c
+++ b/lib/libstand/gzipfs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zipfs.c,v 1.2 1998/09/18 22:58:01 msmith Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libstand/i386/_setjmp.S b/lib/libstand/i386/_setjmp.S
index d3b168c4db50..fc75db7209b8 100644
--- a/lib/libstand/i386/_setjmp.S
+++ b/lib/libstand/i386/_setjmp.S
@@ -33,12 +33,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: _setjmp.S,v 1.1 1999/02/12 17:20:19 dcs Exp $
+ * $FreeBSD$
  */
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$Id: _setjmp.S,v 1.1 1999/02/12 17:20:19 dcs Exp $"
+	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
 /*
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index aa5365ed43d7..99fbb54ca9f2 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.
 .\"
-.\"	$Id: libstand.3,v 1.2 1998/11/01 09:31:08 msmith Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 22, 1998
 .Dt LIBSTAND 3
diff --git a/lib/libstand/pager.c b/lib/libstand/pager.c
index 55bbf09481eb..387fdc31cb9f 100644
--- a/lib/libstand/pager.c
+++ b/lib/libstand/pager.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pager.c,v 1.2 1998/09/18 22:58:00 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * Simple paged-output and paged-viewing functions
diff --git a/lib/libstand/printf.c b/lib/libstand/printf.c
index 5135e10183a9..3e16b6f7b2da 100644
--- a/lib/libstand/printf.c
+++ b/lib/libstand/printf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $Id: printf.c,v 1.1.1.1 1998/08/20 08:19:55 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libstand/qdivrem.c b/lib/libstand/qdivrem.c
index d42b9f507021..a8231f0c1545 100644
--- a/lib/libstand/qdivrem.c
+++ b/lib/libstand/qdivrem.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  * 	From: Id: qdivrem.c,v 1.7 1997/11/07 09:20:40 phk Exp
  */
 
diff --git a/lib/libstand/quad.h b/lib/libstand/quad.h
index bddca839a504..14f57542f761 100644
--- a/lib/libstand/quad.h
+++ b/lib/libstand/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- *	$Id: quad.h,v 1.6 1997/02/22 09:39:58 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libstand/random.c b/lib/libstand/random.c
index 617398af142c..35ddea1add68 100644
--- a/lib/libstand/random.c
+++ b/lib/libstand/random.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
- * $Id: random.c,v 1.6 1997/02/22 09:39:59 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/lib/libstand/sbrk.c b/lib/libstand/sbrk.c
index 0655c9a92781..fce03cf2a29f 100644
--- a/lib/libstand/sbrk.c
+++ b/lib/libstand/sbrk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 74abcd7660b3..80e667e4893c 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.
  *
- *	$Id: stand.h,v 1.12 1998/11/04 07:39:53 msmith Exp $
+ * $FreeBSD$
  * From	$NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $	
  */
 
diff --git a/lib/libstand/twiddle.c b/lib/libstand/twiddle.c
index c74c06b53596..7a9a6692bd93 100644
--- a/lib/libstand/twiddle.c
+++ b/lib/libstand/twiddle.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $Id: subr_prf.c,v 1.46 1998/05/28 09:30:20 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libstand/zalloc.c b/lib/libstand/zalloc.c
index 043df8a9a30d..16a4163a88fb 100644
--- a/lib/libstand/zalloc.c
+++ b/lib/libstand/zalloc.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zalloc.c,v 1.3 1998/09/26 10:48:50 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libstand/zalloc_defs.h b/lib/libstand/zalloc_defs.h
index 051c53fffb12..00696d62443b 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.
  *
- *	$Id: zalloc_defs.h,v 1.4 1998/10/16 19:23:37 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c
index d70a8f7577c0..83e5290a95cd 100644
--- a/lib/libstand/zalloc_malloc.c
+++ b/lib/libstand/zalloc_malloc.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zalloc_malloc.c,v 1.3 1998/10/01 17:35:08 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libstand/zalloc_mem.h b/lib/libstand/zalloc_mem.h
index 13311943fdda..c872da17da73 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.
  *
- *	$Id: zalloc_mem.h,v 1.1 1998/09/26 01:42:39 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/lib/libstand/zalloc_protos.h b/lib/libstand/zalloc_protos.h
index 633453d2a621..c90bd5a3cd35 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.
  *
- *	$Id: zalloc_protos.h,v 1.1 1998/09/26 01:42:39 msmith Exp $
+ * $FreeBSD$
  */
 
 Library void *znalloc(struct MemPool *mpool, iaddr_t bytes);
diff --git a/lib/libstand/zipfs.c b/lib/libstand/zipfs.c
index fb64665cc3a2..b0e30073cd7e 100644
--- a/lib/libstand/zipfs.c
+++ b/lib/libstand/zipfs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zipfs.c,v 1.2 1998/09/18 22:58:01 msmith Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index 2cff21b15973..146a23544f33 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd September 2, 1998
 .Dt LIBTACPLUS 3
diff --git a/lib/libtacplus/tacplus.conf.5 b/lib/libtacplus/tacplus.conf.5
index 0939450a5538..4cb27722c6a4 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1998
 .Dt TACPLUS.CONF 5
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 1589b9a2eaf7..9e791748797a 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 12/15/93
-#	$Id: Makefile,v 1.8 1998/08/30 13:07:16 markm Exp $
+# $FreeBSD$
 
 LIB=	telnet
 SRCS=	genget.c getent.c misc.c
diff --git a/lib/libtermcap/termcap.3 b/lib/libtermcap/termcap.3
index 8195bf55ecc0..99cc12f54a1e 100644
--- a/lib/libtermcap/termcap.3
+++ b/lib/libtermcap/termcap.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)termcap.3	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt TERMCAP 3
diff --git a/lib/libtermcap/termcap.h b/lib/libtermcap/termcap.h
index e5824b7857cc..350390d58cc4 100644
--- a/lib/libtermcap/termcap.h
+++ b/lib/libtermcap/termcap.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: termcap.h,v 1.12 1998/03/12 14:09:55 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _TERMCAP_H_
 #define _TERMCAP_H_
diff --git a/lib/libutil/_secure_path.3 b/lib/libutil/_secure_path.3
index 053546283d07..85fc999496d2 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.
 .\"
-.\" $Id: _secure_path.3,v 1.3 1998/06/06 05:50:42 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1997
 .Os FreeBSD
diff --git a/lib/libutil/_secure_path.c b/lib/libutil/_secure_path.c
index 983292fd241a..c27003c46661 100644
--- a/lib/libutil/_secure_path.c
+++ b/lib/libutil/_secure_path.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file providing the above
  *    conditions are met.
  *
- *	$Id: _secure_path.c,v 1.3 1998/10/09 00:39:08 jkh Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/lib/libutil/auth.3 b/lib/libutil/auth.3
index a026ec550349..14987c3da8a1 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.
 .\" 
-.\" $Id: auth.3,v 1.1 1998/10/08 06:53:32 jkh Exp $
+.\" $FreeBSD$
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/auth.conf.5 b/lib/libutil/auth.conf.5
index 08cf806d18a5..fe54df03627a 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.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd October 7, 1998
 .Dt AUTH.CONF 5
diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h
index 32957d9cbb0d..f41c66590cd2 100644
--- a/lib/libutil/libutil.h
+++ b/lib/libutil/libutil.h
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file providing the above
  *    conditions are met.
  *
- * $Id: libutil.h,v 1.21 1998/12/16 17:52:15 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _LIBUTIL_H_
diff --git a/lib/libutil/login.3 b/lib/libutil/login.3
index faec5bb0cd5f..c8f592c0bd20 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.
 .\" 
-.\" $Id$
+.\" $FreeBSD$
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index 8ff2d5fe0a6f..322c9a69d94e 100644
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)login.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-	"$Id: login.c,v 1.4 1997/08/13 20:42:16 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index 1f487adc2004..3588aa56427d 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.
 .\"
-.\" $Id: login.conf.5,v 1.16 1999/04/30 18:19:46 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 22, 1996
 .Dt LOGIN.CONF 5
diff --git a/lib/libutil/login_auth.3 b/lib/libutil/login_auth.3
index 73b632535aac..5d851f8dae95 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.
 .\"
-.\" $Id: login_auth.3,v 1.5 1998/03/23 13:29:49 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 29, 1996
 .Os FreeBSD
diff --git a/lib/libutil/login_auth.c b/lib/libutil/login_auth.c
index 15f5892141aa..1fb21caee1f2 100644
--- a/lib/libutil/login_auth.c
+++ b/lib/libutil/login_auth.c
@@ -25,7 +25,7 @@
  *
  * Low-level routines relating to the user capabilities database
  *
- *	$Id: login_auth.c,v 1.9 1998/09/16 04:17:47 imp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 2a35e7d93c32..7377d19ce197 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.
 .\"
-.\" $Id: login_cap.3,v 1.12 1999/07/20 20:46:26 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 27, 1996
 .Os FreeBSD
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 0e113aa88a4a..af27766e5064 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -25,7 +25,7 @@
  *
  * Low-level routines relating to the user capabilities database
  *
- *	$Id: login_cap.c,v 1.15 1999/04/24 17:01:58 ache Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h
index f38093606d60..f4b382519770 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
- *	$Id: login_cap.h,v 1.1 1997/05/10 12:49:30 davidn Exp $
+ * $FreeBSD$
  */
 
 #ifndef _LOGIN_CAP_H_
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index 9c9a1c66223d..4bb018577624 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.
 .\"
-.\" $Id: login_class.3,v 1.5 1997/04/13 14:12:48 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 28, 1996
 .Os FreeBSD
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 34e8b5b9d089..589ea4fdf400 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -21,7 +21,7 @@
  *
  * High-level routines relating to use of the user capabilities database
  *
- *	$Id: login_class.c,v 1.10 1998/07/29 14:05:01 ache Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/lib/libutil/login_ok.3 b/lib/libutil/login_ok.3
index f90710f56ad7..b74ab3930520 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.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd January 2, 1997
 .Os FreeBSD
diff --git a/lib/libutil/login_ok.c b/lib/libutil/login_ok.c
index b0927e41735d..365528ba8acb 100644
--- a/lib/libutil/login_ok.c
+++ b/lib/libutil/login_ok.c
@@ -20,7 +20,7 @@
  *
  * Support allow/deny lists in login class capabilities
  *
- *	$Id: login_ok.c,v 1.5 1997/06/16 23:38:01 davidn Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/lib/libutil/login_times.3 b/lib/libutil/login_times.3
index e2e7a3f88503..e9839cd5ff6a 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.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd January 2, 1997
 .Os FreeBSD
diff --git a/lib/libutil/login_times.c b/lib/libutil/login_times.c
index 84ca397d463e..af58974db250 100644
--- a/lib/libutil/login_times.c
+++ b/lib/libutil/login_times.c
@@ -20,7 +20,7 @@
  *
  * Login period parsing and comparison functions.
  *
- *	$Id: login_times.c,v 1.5 1997/05/10 18:55:38 davidn Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/lib/libutil/login_tty.3 b/lib/libutil/login_tty.3
index 8a4c8fe1b3d8..2cde93f43e43 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.
 .\" 
-.\" $Id$
+.\" $FreeBSD$
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index 23792d43cbe6..eb32fc723073 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-	"$Id: login_tty.c,v 1.4 1998/10/09 00:39:08 jkh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/logout.3 b/lib/libutil/logout.3
index 7127e8a2ffa1..580550ffdb23 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.
 .\" 
-.\" $Id: logout.3,v 1.4 1997/02/22 15:08:28 peter Exp $
+.\" $FreeBSD$
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
index e5df7984a150..5b9a821b60d2 100644
--- a/lib/libutil/logout.c
+++ b/lib/libutil/logout.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-	"$Id: logout.c,v 1.4 1998/10/09 00:39:09 jkh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/logwtmp.3 b/lib/libutil/logwtmp.3
index 496595f33b50..b7d3d0a0d7be 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.
 .\" 
-.\" $Id: logwtmp.3,v 1.5 1997/05/11 08:50:33 davidn Exp $
+.\" $FreeBSD$
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
index ad9a86e054c2..fd05b55e80d2 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/libutil/logwtmp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #else
 static const char rcsid[] =
-	"$Id: logwtmp.c,v 1.11 1999/04/08 08:00:06 brian Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/property.3 b/lib/libutil/property.3
index 12b0ba9a3dd1..e6de28dc7977 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.
 .\" 
-.\" $Id: property.3,v 1.5 1999/03/05 17:08:23 bde Exp $
+.\" $FreeBSD$
 .\" "
 .Dd October 7, 1998
 .Os
diff --git a/lib/libutil/pty.3 b/lib/libutil/pty.3
index 342f917778cd..e209fde13f27 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.
 .\" 
-.\" $Id: pty.3,v 1.6 1997/02/22 15:08:31 peter Exp $
+.\" $FreeBSD$
 .\" "
 .Dd December 29, 1996
 .Os
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 18b734981335..0b5e4abde6a8 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
 #else
 static const char rcsid[] =
-	"$Id: pty.c,v 1.8 1998/10/09 11:24:20 jkh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/realhostname.3 b/lib/libutil/realhostname.3
index 4298e7f09831..9e5794d39e42 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.
 .\"
-.\"	$Id:$
+.\" $FreeBSD$
 .\"
 .Dd April 6, 1999
 .Os
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index 240f92974fbc..fa7f4b1a9805 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: realhostname.c,v 1.1 1999/04/06 23:02:35 brian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/lib/libutil/setproctitle.3 b/lib/libutil/setproctitle.3
index 25e91621deb8..96f1ebf91378 100644
--- a/lib/libutil/setproctitle.3
+++ b/lib/libutil/setproctitle.3
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $Id: setproctitle.3,v 1.9 1997/05/11 08:50:33 davidn Exp $
+.\" $FreeBSD$
 .\"
 .\" The following requests are required for all man pages.
 .Dd December 16, 1995
diff --git a/lib/libutil/setproctitle.c b/lib/libutil/setproctitle.c
index 3bce42074da8..a5cf2347e50c 100644
--- a/lib/libutil/setproctitle.c
+++ b/lib/libutil/setproctitle.c
@@ -14,7 +14,7 @@
  * 3. Absolutely no warranty of function or purpose is made by the author
  *    Peter Wemm.
  *
- * $Id: setproctitle.c,v 1.7 1998/04/28 07:02:33 dg Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3
index 263252a8efbe..e4d70b8a711a 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.
 .\"
-.\"	$Id: trimdomain.3,v 1.1 1999/04/07 14:03:31 brian Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 7, 1999
 .Os
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index ae576e374dcb..99534a6fe7c9 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.
 .\" 
-.\" $Id: uucplock.3,v 1.11 1998/05/28 23:17:08 brian Exp $
+.\" $FreeBSD$
 .\" "
 .Dd March 30, 1997
 .Os
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index f6b303ff64dd..012016a3e7c1 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uucplock.c,v 1.10 1998/06/10 00:16:28 brian Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c
index f91d24aa9f3d..e66150ca2348 100644
--- a/lib/libvgl/bitmap.c
+++ b/lib/libvgl/bitmap.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: bitmap.c,v 1.1 1997/08/17 21:09:34 sos Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/libvgl/keyboard.c b/lib/libvgl/keyboard.c
index bb2816487481..690da320e50d 100644
--- a/lib/libvgl/keyboard.c
+++ b/lib/libvgl/keyboard.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: keyboard.c,v 1.1 1997/10/01 20:53:38 sos Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c
index ade2442a100b..3e0a51202ab4 100644
--- a/lib/libvgl/main.c
+++ b/lib/libvgl/main.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: main.c,v 1.2 1997/10/01 20:53:39 sos Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c
index 6f54be602cf5..a5ded2f2a424 100644
--- a/lib/libvgl/mouse.c
+++ b/lib/libvgl/mouse.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: mouse.c,v 1.10 1997/08/15 12:32:59 sos Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c
index 9cef00f185b2..2ca923ca7ff7 100644
--- a/lib/libvgl/simple.c
+++ b/lib/libvgl/simple.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: simple.c,v 1.1 1997/08/17 21:09:35 sos Exp $
+ * $FreeBSD$
  */
 
 #include <signal.h>
diff --git a/lib/libvgl/text.c b/lib/libvgl/text.c
index c5baf3b177ee..a2c6417301e5 100644
--- a/lib/libvgl/text.c
+++ b/lib/libvgl/text.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: text.c,v 1.1 1997/08/17 21:09:35 sos Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index 4ade50128114..713e67216615 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.
 .\" 
-.\" $Id: vgl.3,v 1.3 1997/10/22 23:12:27 jraynard Exp $
+.\" $FreeBSD$
 
 .Dd August 13, 1997
 .Dt VGL 3
diff --git a/lib/libvgl/vgl.h b/lib/libvgl/vgl.h
index b08dc823b9f2..8704ac97ecdf 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.
  *
- *  $Id: vgl.h,v 1.1 1997/08/17 21:09:35 sos Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 7c23b5de8f0b..83800677642f 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 1999/03/14 17:56:11 markm Exp $
+# $FreeBSD$
 #
 
 MAINTAINER=markm@FreeBSD.org
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index 2cb776ff386e..8c816a9c2d5e 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1997/02/22 15:08:39 peter Exp $
+# $FreeBSD$
 
 LIB=		y
 SHLIB_MAJOR=	2
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 8b8e6cff4a90..250e005d857c 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.8 1998/04/17 07:26:51 phk Exp $
+# $FreeBSD$
 #
 
 MAINTAINER=peter@FreeBSD.org
diff --git a/lib/libz/adler32.c b/lib/libz/adler32.c
index 16cf9a703f7c..8d42f875a8f9 100644
--- a/lib/libz/adler32.c
+++ b/lib/libz/adler32.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id$ */
+/* @(#) $FreeBSD$ */
 
 #include "zlib.h"
 
diff --git a/lib/libz/compress.c b/lib/libz/compress.c
index 1cee470913d7..4ff6bc1e7f09 100644
--- a/lib/libz/compress.c
+++ b/lib/libz/compress.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id$ */
+/* @(#) $FreeBSD$ */
 
 #include "zlib.h"
 
diff --git a/lib/libz/crc32.c b/lib/libz/crc32.c
index a91101a81c6a..3f8ce1df5ff8 100644
--- a/lib/libz/crc32.c
+++ b/lib/libz/crc32.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id$ */
+/* @(#) $FreeBSD$ */
 
 #include "zlib.h"
 
diff --git a/lib/libz/deflate.c b/lib/libz/deflate.c
index cfa05059d3ff..10bb235fa16b 100644
--- a/lib/libz/deflate.c
+++ b/lib/libz/deflate.c
@@ -47,7 +47,7 @@
  *
  */
 
-/* @(#) $Id: deflate.c,v 1.1.1.3 1999/01/10 09:46:53 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 #include "deflate.h"
 
diff --git a/lib/libz/deflate.h b/lib/libz/deflate.h
index 112a15e0f443..998528880454 100644
--- a/lib/libz/deflate.h
+++ b/lib/libz/deflate.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: deflate.h,v 1.1.1.3 1999/01/10 09:46:53 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 #ifndef _DEFLATE_H
 #define _DEFLATE_H
diff --git a/lib/libz/example.c b/lib/libz/example.c
index ed718cbe5f5b..045751f3c19e 100644
--- a/lib/libz/example.c
+++ b/lib/libz/example.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: example.c,v 1.1.1.3 1999/01/10 09:46:54 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c
index b2090b809480..8c5d521b4ab2 100644
--- a/lib/libz/gzio.c
+++ b/lib/libz/gzio.c
@@ -5,7 +5,7 @@
  * Compile this file with -DNO_DEFLATE to avoid the compression code.
  */
 
-/* @(#) $Id: gzio.c,v 1.1.1.3 1999/01/10 09:46:54 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 #include <stdio.h>
 
diff --git a/lib/libz/minigzip.c b/lib/libz/minigzip.c
index 180b39d2ce24..ba4b2dc9e8df 100644
--- a/lib/libz/minigzip.c
+++ b/lib/libz/minigzip.c
@@ -13,7 +13,7 @@
  * or in pipe mode.
  */
 
-/* @(#) $Id: minigzip.c,v 1.1.1.3 1999/01/10 09:46:57 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/trees.c b/lib/libz/trees.c
index b02b5277f48a..bd7044012cfa 100644
--- a/lib/libz/trees.c
+++ b/lib/libz/trees.c
@@ -29,7 +29,7 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $Id: trees.c,v 1.1.1.3 1999/01/10 09:46:57 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 /* #define GEN_TREES_H */
 
diff --git a/lib/libz/uncompr.c b/lib/libz/uncompr.c
index d1033213781e..25472c0f94c7 100644
--- a/lib/libz/uncompr.c
+++ b/lib/libz/uncompr.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id$ */
+/* @(#) $FreeBSD$ */
 
 #include "zlib.h"
 
diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h
index f06124f81b7f..5b882be76d4d 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 
  */
 
-/* @(#) $Id: zconf.h,v 1.1.1.3 1999/01/10 09:46:58 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
diff --git a/lib/libz/zutil.c b/lib/libz/zutil.c
index 60340c838cb9..8419dbcdab34 100644
--- a/lib/libz/zutil.c
+++ b/lib/libz/zutil.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: zutil.c,v 1.1.1.3 1999/01/10 09:46:59 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 #include "zutil.h"
 
diff --git a/lib/libz/zutil.h b/lib/libz/zutil.h
index 429339ff9846..378703d03a54 100644
--- a/lib/libz/zutil.h
+++ b/lib/libz/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zutil.h,v 1.1.1.3 1999/01/10 09:46:59 peter Exp $ */
+/* @(#) $FreeBSD$ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 0507810348f8..4281b142a957 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -1,5 +1,5 @@
 #  @(#)Makefile 5.1beta 93/09/24
-#  $Id: Makefile,v 1.21 1998/12/23 11:50:51 dfr Exp $
+# $FreeBSD$
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
diff --git a/lib/msun/alpha/s_copysign.S b/lib/msun/alpha/s_copysign.S
index 98417dcd712d..2a724e228c48 100644
--- a/lib/msun/alpha/s_copysign.S
+++ b/lib/msun/alpha/s_copysign.S
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	From: NetBSD: s_copysign.S,v 1.3 1997/07/30 23:58:38 jtc Exp	*/
 
 /*-
diff --git a/lib/msun/alpha/s_copysignf.S b/lib/msun/alpha/s_copysignf.S
index 5ce0f9127431..d8a42a464c4c 100644
--- a/lib/msun/alpha/s_copysignf.S
+++ b/lib/msun/alpha/s_copysignf.S
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	From: NetBSD: s_copysignf.S,v 1.3 1997/07/30 23:58:41 jtc Exp */
 
 /*-
diff --git a/lib/msun/i387/e_acos.S b/lib/msun/i387/e_acos.S
index 9c0b286a63d3..bd1499c66d5f 100644
--- a/lib/msun/i387/e_acos.S
+++ b/lib/msun/i387/e_acos.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_acos.S,v 1.5 1997/02/22 15:08:43 peter Exp $")
+RCSID("$FreeBSD$")
 
 /*
  * acos(x) = atan2(sqrt(1  - x^2, x).
diff --git a/lib/msun/i387/e_asin.S b/lib/msun/i387/e_asin.S
index 3c22226109ae..1876cfd7d343 100644
--- a/lib/msun/i387/e_asin.S
+++ b/lib/msun/i387/e_asin.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_asin.S,v 1.5 1997/02/22 15:08:44 peter Exp $")
+RCSID("$FreeBSD$")
 
 /*
  * asin(x) = atan2(x, sqrt(1  - x^2).
diff --git a/lib/msun/i387/e_atan2.S b/lib/msun/i387/e_atan2.S
index 1e20fd5e3d29..456de5636f60 100644
--- a/lib/msun/i387/e_atan2.S
+++ b/lib/msun/i387/e_atan2.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_atan2.S,v 1.4 1997/02/22 15:08:45 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(__ieee754_atan2)
 	fldl	 4(%esp)
diff --git a/lib/msun/i387/e_exp.S b/lib/msun/i387/e_exp.S
index 6145ffe3d9c8..6e0dd396defd 100644
--- a/lib/msun/i387/e_exp.S
+++ b/lib/msun/i387/e_exp.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_exp.S,v 1.6 1997/02/22 15:08:46 peter Exp $")
+RCSID("$FreeBSD$")
 
 /* e^x = 2^(x * log2(e)) */
 ENTRY(__ieee754_exp)
diff --git a/lib/msun/i387/e_fmod.S b/lib/msun/i387/e_fmod.S
index 6ecc71679a16..0ce2450d4302 100644
--- a/lib/msun/i387/e_fmod.S
+++ b/lib/msun/i387/e_fmod.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_fmod.S,v 1.4 1997/02/22 15:08:47 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(__ieee754_fmod)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_log.S b/lib/msun/i387/e_log.S
index d1415d3bc5c9..79a58c1739e3 100644
--- a/lib/msun/i387/e_log.S
+++ b/lib/msun/i387/e_log.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_log.S,v 1.4 1997/02/22 15:08:48 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(__ieee754_log)
 	fldln2
diff --git a/lib/msun/i387/e_log10.S b/lib/msun/i387/e_log10.S
index 808af7bc0eba..c7f9bc437ac8 100644
--- a/lib/msun/i387/e_log10.S
+++ b/lib/msun/i387/e_log10.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_log10.S,v 1.4 1997/02/22 15:08:49 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(__ieee754_log10)
 	fldlg2
diff --git a/lib/msun/i387/e_remainder.S b/lib/msun/i387/e_remainder.S
index 39289bcfe4a2..cf0808bc7490 100644
--- a/lib/msun/i387/e_remainder.S
+++ b/lib/msun/i387/e_remainder.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_remainder.S,v 1.4 1997/02/22 15:08:50 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(__ieee754_remainder)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_scalb.S b/lib/msun/i387/e_scalb.S
index 8b7798061301..fc8bb779525a 100644
--- a/lib/msun/i387/e_scalb.S
+++ b/lib/msun/i387/e_scalb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_scalb.S,v 1.5 1997/02/22 15:08:51 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(__ieee754_scalb)
 	fldl	12(%esp)
diff --git a/lib/msun/i387/e_sqrt.S b/lib/msun/i387/e_sqrt.S
index b6ab4c9f6212..f0403f0dfd7f 100644
--- a/lib/msun/i387/e_sqrt.S
+++ b/lib/msun/i387/e_sqrt.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: e_sqrt.S,v 1.4 1997/02/22 15:08:52 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(__ieee754_sqrt)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_atan.S b/lib/msun/i387/s_atan.S
index 3625ecef749f..1150cce97802 100644
--- a/lib/msun/i387/s_atan.S
+++ b/lib/msun/i387/s_atan.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_atan.S,v 1.4 1997/02/22 15:08:53 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(atan)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_ceil.S b/lib/msun/i387/s_ceil.S
index b97345a5e63b..e805d8524bb9 100644
--- a/lib/msun/i387/s_ceil.S
+++ b/lib/msun/i387/s_ceil.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_ceil.S,v 1.5 1997/02/22 15:08:54 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(ceil)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_copysign.S b/lib/msun/i387/s_copysign.S
index eccdbb8c10ec..ec28b452bfa7 100644
--- a/lib/msun/i387/s_copysign.S
+++ b/lib/msun/i387/s_copysign.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_copysign.S,v 1.4 1997/02/22 15:08:55 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(copysign)
 	movl	16(%esp),%edx
diff --git a/lib/msun/i387/s_cos.S b/lib/msun/i387/s_cos.S
index 9e4f139c64b0..a73ba0621229 100644
--- a/lib/msun/i387/s_cos.S
+++ b/lib/msun/i387/s_cos.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_cos.S,v 1.4 1997/02/22 15:08:55 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(cos)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_finite.S b/lib/msun/i387/s_finite.S
index 4f6db83c4c9d..b27b7d1149df 100644
--- a/lib/msun/i387/s_finite.S
+++ b/lib/msun/i387/s_finite.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_finite.S,v 1.5 1997/03/09 14:00:50 bde Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(finite)
 	movl	8(%esp),%eax
diff --git a/lib/msun/i387/s_floor.S b/lib/msun/i387/s_floor.S
index 13e79c0c98f6..66c1d9f9d0f5 100644
--- a/lib/msun/i387/s_floor.S
+++ b/lib/msun/i387/s_floor.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_floor.S,v 1.5 1997/02/22 15:08:57 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(floor)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_ilogb.S b/lib/msun/i387/s_ilogb.S
index 640bd2836bea..c0c0eaf1746e 100644
--- a/lib/msun/i387/s_ilogb.S
+++ b/lib/msun/i387/s_ilogb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_ilogb.S,v 1.5 1997/02/22 15:08:59 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(ilogb)
 	pushl	%ebp
diff --git a/lib/msun/i387/s_log1p.S b/lib/msun/i387/s_log1p.S
index 07f3c64d0757..24b28219d345 100644
--- a/lib/msun/i387/s_log1p.S
+++ b/lib/msun/i387/s_log1p.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_log1p.S,v 1.5 1997/02/22 15:08:59 peter Exp $")
+RCSID("$FreeBSD$")
 
 /*
  * The fyl2xp1 instruction has such a limited range:
diff --git a/lib/msun/i387/s_logb.S b/lib/msun/i387/s_logb.S
index dedb853f50d6..ef9d56ef4f6e 100644
--- a/lib/msun/i387/s_logb.S
+++ b/lib/msun/i387/s_logb.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_logb.S,v 1.4 1997/02/22 15:09:00 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(logb)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_rint.S b/lib/msun/i387/s_rint.S
index 91a1ee0fb99e..79da080d7110 100644
--- a/lib/msun/i387/s_rint.S
+++ b/lib/msun/i387/s_rint.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_rint.S,v 1.4 1997/02/22 15:09:01 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(rint)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_scalbn.S b/lib/msun/i387/s_scalbn.S
index 2678c39d0e97..c00e1fb137e0 100644
--- a/lib/msun/i387/s_scalbn.S
+++ b/lib/msun/i387/s_scalbn.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_scalbn.S,v 1.5 1997/02/22 15:09:02 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(scalbn)
 	fildl	12(%esp)
diff --git a/lib/msun/i387/s_significand.S b/lib/msun/i387/s_significand.S
index 63ddd6ba3482..7210f9bd7512 100644
--- a/lib/msun/i387/s_significand.S
+++ b/lib/msun/i387/s_significand.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_significand.S,v 1.4 1997/02/22 15:09:03 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(significand)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_sin.S b/lib/msun/i387/s_sin.S
index 9691edb5d9ad..d152352abf2f 100644
--- a/lib/msun/i387/s_sin.S
+++ b/lib/msun/i387/s_sin.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_sin.S,v 1.4 1997/02/22 15:09:05 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(sin)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_tan.S b/lib/msun/i387/s_tan.S
index 4bf19856fa04..d0cbc0aabd97 100644
--- a/lib/msun/i387/s_tan.S
+++ b/lib/msun/i387/s_tan.S
@@ -35,7 +35,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$Id: s_tan.S,v 1.4 1997/02/22 15:09:06 peter Exp $")
+RCSID("$FreeBSD$")
 
 ENTRY(tan)
 	fldl	4(%esp)
diff --git a/lib/msun/man/acos.3 b/lib/msun/man/acos.3
index 1af095e7683f..71418b84be5f 100644
--- a/lib/msun/man/acos.3
+++ b/lib/msun/man/acos.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acos.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt ACOS 3
diff --git a/lib/msun/man/acosh.3 b/lib/msun/man/acosh.3
index 9ac3247a0038..b7d9f7b047c3 100644
--- a/lib/msun/man/acosh.3
+++ b/lib/msun/man/acosh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)acosh.3	5.2 (Berkeley) 5/6/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 6, 1991
 .Dt ACOSH 3
diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3
index eeb4f7c5bbf8..1e4b2c1cd646 100644
--- a/lib/msun/man/asin.3
+++ b/lib/msun/man/asin.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asin.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt ASIN 3
diff --git a/lib/msun/man/asinh.3 b/lib/msun/man/asinh.3
index d122497bc579..eb3f2f3616f4 100644
--- a/lib/msun/man/asinh.3
+++ b/lib/msun/man/asinh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)asinh.3	6.4 (Berkeley) 5/6/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 6, 1991
 .Dt ASINH 3
diff --git a/lib/msun/man/atan.3 b/lib/msun/man/atan.3
index b68bf341b965..e26d0127ae65 100644
--- a/lib/msun/man/atan.3
+++ b/lib/msun/man/atan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt ATAN 3
diff --git a/lib/msun/man/atan2.3 b/lib/msun/man/atan2.3
index 75e556c72e5d..36f1c0c1f7ad 100644
--- a/lib/msun/man/atan2.3
+++ b/lib/msun/man/atan2.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atan2.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt ATAN2 3
diff --git a/lib/msun/man/atanh.3 b/lib/msun/man/atanh.3
index 9c8acf379d6f..6e770b41944e 100644
--- a/lib/msun/man/atanh.3
+++ b/lib/msun/man/atanh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)atanh.3	5.2 (Berkeley) 5/6/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 6, 1991
 .Dt ATANH 3
diff --git a/lib/msun/man/ceil.3 b/lib/msun/man/ceil.3
index 8f178716eccd..93f4595779e7 100644
--- a/lib/msun/man/ceil.3
+++ b/lib/msun/man/ceil.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ceil.3	5.1 (Berkeley) 5/2/91
-.\"	$Id: ceil.3,v 1.6 1997/02/22 15:09:26 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 10, 1994
 .Dt CEIL 3
diff --git a/lib/msun/man/cos.3 b/lib/msun/man/cos.3
index f9e4b2768bbc..c6b108433827 100644
--- a/lib/msun/man/cos.3
+++ b/lib/msun/man/cos.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cos.3	5.1 (Berkeley) 5/2/91
-.\"	$Id: cos.3,v 1.5 1997/02/22 15:09:27 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt COS 3
diff --git a/lib/msun/man/cosh.3 b/lib/msun/man/cosh.3
index 9255ecc7fada..799ba9794299 100644
--- a/lib/msun/man/cosh.3
+++ b/lib/msun/man/cosh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)cosh.3	5.1 (Berkeley) 5/2/91
-.\"	$Id: cosh.3,v 1.5 1997/02/22 15:09:28 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt COSH 3
diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3
index c63aacc9ab27..95240b691e2e 100644
--- a/lib/msun/man/erf.3
+++ b/lib/msun/man/erf.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)erf.3	6.4 (Berkeley) 4/20/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 20, 1991
 .Dt ERF 3
diff --git a/lib/msun/man/exp.3 b/lib/msun/man/exp.3
index 9e38d643577b..065d55670b8b 100644
--- a/lib/msun/man/exp.3
+++ b/lib/msun/man/exp.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)exp.3	6.12 (Berkeley) 7/31/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd July 31, 1991
 .Dt EXP 3
diff --git a/lib/msun/man/fabs.3 b/lib/msun/man/fabs.3
index e7cd317c989a..551b41d8ce08 100644
--- a/lib/msun/man/fabs.3
+++ b/lib/msun/man/fabs.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fabs.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt FABS 3
diff --git a/lib/msun/man/floor.3 b/lib/msun/man/floor.3
index 71080f097ead..4371fd53c4ec 100644
--- a/lib/msun/man/floor.3
+++ b/lib/msun/man/floor.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)floor.3	6.5 (Berkeley) 4/19/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 10, 1994
 .Dt FLOOR 3
diff --git a/lib/msun/man/fmod.3 b/lib/msun/man/fmod.3
index 61cdfa0af531..849b1d77b44f 100644
--- a/lib/msun/man/fmod.3
+++ b/lib/msun/man/fmod.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fmod.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt FMOD 3
diff --git a/lib/msun/man/hypot.3 b/lib/msun/man/hypot.3
index bebd1dba6056..c65064ab9193 100644
--- a/lib/msun/man/hypot.3
+++ b/lib/msun/man/hypot.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)hypot.3	6.7 (Berkeley) 5/6/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 6, 1991
 .Dt HYPOT 3
diff --git a/lib/msun/man/ieee.3 b/lib/msun/man/ieee.3
index c983a3f0e4b1..1056fef76524 100644
--- a/lib/msun/man/ieee.3
+++ b/lib/msun/man/ieee.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd Feb 25, 1994
 .Dt IEEE 3
diff --git a/lib/msun/man/ieee_test.3 b/lib/msun/man/ieee_test.3
index c2c7e497afaf..7ff205939259 100644
--- a/lib/msun/man/ieee_test.3
+++ b/lib/msun/man/ieee_test.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ieee.3	6.4 (Berkeley) 5/6/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 10, 1994
 .Dt IEEE_TEST 3
diff --git a/lib/msun/man/j0.3 b/lib/msun/man/j0.3
index 54088c3afd9b..8dbbb5bcca73 100644
--- a/lib/msun/man/j0.3
+++ b/lib/msun/man/j0.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)j0.3	6.7 (Berkeley) 4/19/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1991
 .Dt J0 3
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index 6f469fd82549..b7eeca04ae27 100644
--- a/lib/msun/man/lgamma.3
+++ b/lib/msun/man/lgamma.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)lgamma.3	6.6 (Berkeley) 12/3/92
-.\"	$Id: lgamma.3,v 1.5 1997/02/22 15:09:38 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1992
 .Dt LGAMMA 3
diff --git a/lib/msun/man/math.3 b/lib/msun/man/math.3
index 1b129fc94e66..e2231de2407c 100644
--- a/lib/msun/man/math.3
+++ b/lib/msun/man/math.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)math.3	6.10 (Berkeley) 5/6/91
-.\"	$Id: math.3,v 1.6 1998/01/15 23:28:18 danny Exp $
+.\" $FreeBSD$
 .\"
 .TH MATH 3M "May 6, 1991"
 .UC 4
diff --git a/lib/msun/man/rint.3 b/lib/msun/man/rint.3
index 5aa591d3fad9..c8e320d9d979 100644
--- a/lib/msun/man/rint.3
+++ b/lib/msun/man/rint.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rint.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 10, 1994
 .Dt RINT 3
diff --git a/lib/msun/man/sin.3 b/lib/msun/man/sin.3
index 222f24baa0f6..82e873bd8286 100644
--- a/lib/msun/man/sin.3
+++ b/lib/msun/man/sin.3
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sin.3	6.7 (Berkeley) 4/19/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1991
 .Dt SIN 3
diff --git a/lib/msun/man/sinh.3 b/lib/msun/man/sinh.3
index 91b17f1af594..d445a1f1ef6c 100644
--- a/lib/msun/man/sinh.3
+++ b/lib/msun/man/sinh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sinh.3	6.6 (Berkeley) 4/19/91
-.\"	$Id$
+.\" $FreeBSD$
 .Dd April 19, 1991
 .Dt SINH 3
 .Os
diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3
index d3e698d7968e..41c16b3b0ef7 100644
--- a/lib/msun/man/sqrt.3
+++ b/lib/msun/man/sqrt.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sqrt.3	6.4 (Berkeley) 5/6/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 6, 1991
 .Dt SQRT 3
diff --git a/lib/msun/man/tan.3 b/lib/msun/man/tan.3
index 21af6393e90d..642e243c5756 100644
--- a/lib/msun/man/tan.3
+++ b/lib/msun/man/tan.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tan.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt TAN 3
diff --git a/lib/msun/man/tanh.3 b/lib/msun/man/tanh.3
index 3d5f90263acd..0145bb783646 100644
--- a/lib/msun/man/tanh.3
+++ b/lib/msun/man/tanh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)tanh.3	5.1 (Berkeley) 5/2/91
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt TANH 3
diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c
index da965af5f52c..7bdb79c9dcd7 100644
--- a/lib/msun/src/e_acos.c
+++ b/lib/msun/src/e_acos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_acos.c,v 1.5 1997/02/22 15:09:54 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_acos(x)
diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c
index f3c6a5029479..b249710f36e3 100644
--- a/lib/msun/src/e_acosf.c
+++ b/lib/msun/src/e_acosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_acosf.c,v 1.4 1997/02/22 15:09:55 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c
index a471769bac09..434e879fdaab 100644
--- a/lib/msun/src/e_acosh.c
+++ b/lib/msun/src/e_acosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_acosh.c,v 1.4 1997/02/22 15:09:56 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_acosh(x)
diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c
index 1d234d249c4f..ad0e3a380b20 100644
--- a/lib/msun/src/e_acoshf.c
+++ b/lib/msun/src/e_acoshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_acoshf.c,v 1.4 1997/02/22 15:09:56 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c
index e7814c97f9d4..de7af9e71c19 100644
--- a/lib/msun/src/e_asin.c
+++ b/lib/msun/src/e_asin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_asin.c,v 1.6 1997/02/22 15:09:57 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_asin(x)
diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c
index 593f2e562e33..2f1e2e2c4f3e 100644
--- a/lib/msun/src/e_asinf.c
+++ b/lib/msun/src/e_asinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_asinf.c,v 1.5 1997/02/22 15:09:58 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c
index d85db89500eb..b07d543bfcb2 100644
--- a/lib/msun/src/e_atan2.c
+++ b/lib/msun/src/e_atan2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_atan2(y,x)
diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c
index 674243249286..6e6c181bde04 100644
--- a/lib/msun/src/e_atan2f.c
+++ b/lib/msun/src/e_atan2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c
index 0c683e17b312..97a79f0f9e4b 100644
--- a/lib/msun/src/e_atanh.c
+++ b/lib/msun/src/e_atanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_atanh(x)
diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c
index d4126afb33e5..dc55b3b6706e 100644
--- a/lib/msun/src/e_atanhf.c
+++ b/lib/msun/src/e_atanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c
index 3a7ac972ed74..47723c53d7fc 100644
--- a/lib/msun/src/e_cosh.c
+++ b/lib/msun/src/e_cosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_cosh(x)
diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c
index 501d87bd057c..9ea041626656 100644
--- a/lib/msun/src/e_coshf.c
+++ b/lib/msun/src/e_coshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c
index e0d64695520d..2fc04c61dbb0 100644
--- a/lib/msun/src/e_exp.c
+++ b/lib/msun/src/e_exp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_exp(x)
diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c
index 24e9096e72c7..8f37f6f11470 100644
--- a/lib/msun/src/e_expf.c
+++ b/lib/msun/src/e_expf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c
index 4f65de1f2a00..f16863072963 100644
--- a/lib/msun/src/e_fmod.c
+++ b/lib/msun/src/e_fmod.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c
index 2c0bd81c88d9..01d85d07d058 100644
--- a/lib/msun/src/e_fmodf.c
+++ b/lib/msun/src/e_fmodf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c
index 6401d5966c42..bad4569e5175 100644
--- a/lib/msun/src/e_gamma.c
+++ b/lib/msun/src/e_gamma.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_gamma(x)
diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c
index d1334f308462..7d5197f88cf3 100644
--- a/lib/msun/src/e_gamma_r.c
+++ b/lib/msun/src/e_gamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_gamma_r(x, signgamp)
diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c
index 97731d9d0f66..f05ebefdcd99 100644
--- a/lib/msun/src/e_gammaf.c
+++ b/lib/msun/src/e_gammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_gammaf(x)
diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c
index 4e2e4a7204fe..6847aa79ddd7 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[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_gammaf_r(x, signgamp)
diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c
index b2a577f8008e..40af9c789f58 100644
--- a/lib/msun/src/e_hypot.c
+++ b/lib/msun/src/e_hypot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_hypot.c,v 1.4 1997/02/22 15:10:12 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_hypot(x,y)
diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c
index 5a409180a07c..52b2288876b5 100644
--- a/lib/msun/src/e_hypotf.c
+++ b/lib/msun/src/e_hypotf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_hypotf.c,v 1.5 1997/03/05 11:54:00 bde Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c
index ecbc9b72bdae..1747d784d6bb 100644
--- a/lib/msun/src/e_j0.c
+++ b/lib/msun/src/e_j0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_j0(x), __ieee754_y0(x)
diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c
index cdfedd96375a..ad27122ac163 100644
--- a/lib/msun/src/e_j0f.c
+++ b/lib/msun/src/e_j0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c
index 8af45609c680..6d60a785bf56 100644
--- a/lib/msun/src/e_j1.c
+++ b/lib/msun/src/e_j1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_j1(x), __ieee754_y1(x)
diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c
index 137b5f897fae..2d4b93aec31d 100644
--- a/lib/msun/src/e_j1f.c
+++ b/lib/msun/src/e_j1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c
index 2265639764c9..cfe26e81f583 100644
--- a/lib/msun/src/e_jn.c
+++ b/lib/msun/src/e_jn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/e_jnf.c b/lib/msun/src/e_jnf.c
index 544d6e508424..03ed9308c88e 100644
--- a/lib/msun/src/e_jnf.c
+++ b/lib/msun/src/e_jnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c
index 1bf264bb844f..ca25a43c0078 100644
--- a/lib/msun/src/e_lgamma.c
+++ b/lib/msun/src/e_lgamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_lgamma(x)
diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c
index ab6d2f0e7f58..a66465589081 100644
--- a/lib/msun/src/e_lgamma_r.c
+++ b/lib/msun/src/e_lgamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_lgamma_r(x, signgamp)
diff --git a/lib/msun/src/e_lgammaf.c b/lib/msun/src/e_lgammaf.c
index c44054e1e6e6..dde3f95ba2f1 100644
--- a/lib/msun/src/e_lgammaf.c
+++ b/lib/msun/src/e_lgammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_lgammaf(x)
diff --git a/lib/msun/src/e_lgammaf_r.c b/lib/msun/src/e_lgammaf_r.c
index 9fbe798c11a9..0e578880568f 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[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c
index 93294a2ae57c..6ebeb910d020 100644
--- a/lib/msun/src/e_log.c
+++ b/lib/msun/src/e_log.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_log(x)
diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c
index afc33764d9a2..5c02df8c33fb 100644
--- a/lib/msun/src/e_log10.c
+++ b/lib/msun/src/e_log10.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_log10(x)
diff --git a/lib/msun/src/e_log10f.c b/lib/msun/src/e_log10f.c
index ed5f3e75da31..8b11d3817cf6 100644
--- a/lib/msun/src/e_log10f.c
+++ b/lib/msun/src/e_log10f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_logf.c b/lib/msun/src/e_logf.c
index 48a0d86a9690..4a286a6a97e5 100644
--- a/lib/msun/src/e_logf.c
+++ b/lib/msun/src/e_logf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c
index 1aa2f02aa848..18ba4fa1ec35 100644
--- a/lib/msun/src/e_pow.c
+++ b/lib/msun/src/e_pow.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_pow.c,v 1.4 1997/02/22 15:10:29 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #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 a68bb8b05ee3..34f5d4718e57 100644
--- a/lib/msun/src/e_powf.c
+++ b/lib/msun/src/e_powf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_powf.c,v 1.4 1997/02/22 15:10:30 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c
index 1ee6ce315496..0d182de316ed 100644
--- a/lib/msun/src/e_rem_pio2.c
+++ b/lib/msun/src/e_rem_pio2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #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 49e698fdfa54..cf9cecc36c86 100644
--- a/lib/msun/src/e_rem_pio2f.c
+++ b/lib/msun/src/e_rem_pio2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_rem_pio2f(x,y)
diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c
index 4b603a0deddf..c41d392adc58 100644
--- a/lib/msun/src/e_remainder.c
+++ b/lib/msun/src/e_remainder.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_remainder(x,p)
diff --git a/lib/msun/src/e_remainderf.c b/lib/msun/src/e_remainderf.c
index ddfc8defd66c..d5f670e8a022 100644
--- a/lib/msun/src/e_remainderf.c
+++ b/lib/msun/src/e_remainderf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c
index 89a4127aee38..14f167ee0d54 100644
--- a/lib/msun/src/e_scalb.c
+++ b/lib/msun/src/e_scalb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/e_scalbf.c b/lib/msun/src/e_scalbf.c
index df2a54d302f8..c6785703fe05 100644
--- a/lib/msun/src/e_scalbf.c
+++ b/lib/msun/src/e_scalbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_sinh.c b/lib/msun/src/e_sinh.c
index 764fdc3a15b0..2ac789118699 100644
--- a/lib/msun/src/e_sinh.c
+++ b/lib/msun/src/e_sinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_sinh(x)
diff --git a/lib/msun/src/e_sinhf.c b/lib/msun/src/e_sinhf.c
index 26db9789daeb..fc417dee769b 100644
--- a/lib/msun/src/e_sinhf.c
+++ b/lib/msun/src/e_sinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c
index 813017fb4ee6..bea3b200abbd 100644
--- a/lib/msun/src/e_sqrt.c
+++ b/lib/msun/src/e_sqrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __ieee754_sqrt(x)
diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c
index d7748e23ff71..b7e7d6105004 100644
--- a/lib/msun/src/e_sqrtf.c
+++ b/lib/msun/src/e_sqrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/get_hw_float.c b/lib/msun/src/get_hw_float.c
index fea5c89a81ec..ffa9d7050c14 100644
--- a/lib/msun/src/get_hw_float.c
+++ b/lib/msun/src/get_hw_float.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/lib/msun/src/k_cos.c b/lib/msun/src/k_cos.c
index f2ba37338979..1694c3f489b8 100644
--- a/lib/msun/src/k_cos.c
+++ b/lib/msun/src/k_cos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c
index 65f31921280d..fb49a6b9994f 100644
--- a/lib/msun/src/k_cosf.c
+++ b/lib/msun/src/k_cosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_rem_pio2.c b/lib/msun/src/k_rem_pio2.c
index 6e46a95e8124..8971a84e5c75 100644
--- a/lib/msun/src/k_rem_pio2.c
+++ b/lib/msun/src/k_rem_pio2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/k_rem_pio2f.c b/lib/msun/src/k_rem_pio2f.c
index 1ae7ade545d6..00144974a05e 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[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c
index b2f05e6f764d..df2dc26b751c 100644
--- a/lib/msun/src/k_sin.c
+++ b/lib/msun/src/k_sin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __kernel_sin( x, y, iy)
diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c
index 9317793104aa..ab81d4d265be 100644
--- a/lib/msun/src/k_sinf.c
+++ b/lib/msun/src/k_sinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_standard.c b/lib/msun/src/k_standard.c
index 84ee2a41d506..2b62052d8220 100644
--- a/lib/msun/src/k_standard.c
+++ b/lib/msun/src/k_standard.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_tan.c b/lib/msun/src/k_tan.c
index 00ea9a4858f5..d03c3874cd5b 100644
--- a/lib/msun/src/k_tan.c
+++ b/lib/msun/src/k_tan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* __kernel_tan( x, y, k )
diff --git a/lib/msun/src/k_tanf.c b/lib/msun/src/k_tanf.c
index ad585f6fd451..bb03b9fb4962 100644
--- a/lib/msun/src/k_tanf.c
+++ b/lib/msun/src/k_tanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h
index 14a80e3e28b8..6d518775157c 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
- * $Id: math.h,v 1.5 1997/08/31 22:12:19 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MATH_H_
diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h
index f9add4159db3..668d49936d65 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
- * $Id: math_private.h,v 1.4 1997/02/22 15:10:55 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MATH_PRIVATE_H_
diff --git a/lib/msun/src/s_asinh.c b/lib/msun/src/s_asinh.c
index 927632710103..c1dbde88d992 100644
--- a/lib/msun/src/s_asinh.c
+++ b/lib/msun/src/s_asinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_asinh.c,v 1.4 1997/02/22 15:10:56 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* asinh(x)
diff --git a/lib/msun/src/s_asinhf.c b/lib/msun/src/s_asinhf.c
index b14db857a084..9910b2a43d63 100644
--- a/lib/msun/src/s_asinhf.c
+++ b/lib/msun/src/s_asinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_asinhf.c,v 1.4 1997/02/22 15:10:57 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_atan.c b/lib/msun/src/s_atan.c
index 40e3de90ba64..029fbc29b6fa 100644
--- a/lib/msun/src/s_atan.c
+++ b/lib/msun/src/s_atan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* atan(x)
diff --git a/lib/msun/src/s_atanf.c b/lib/msun/src/s_atanf.c
index f8e103d07b21..ff702f6e66b0 100644
--- a/lib/msun/src/s_atanf.c
+++ b/lib/msun/src/s_atanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_cbrt.c b/lib/msun/src/s_cbrt.c
index 09f8d08efa94..93edad76a033 100644
--- a/lib/msun/src/s_cbrt.c
+++ b/lib/msun/src/s_cbrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_cbrtf.c b/lib/msun/src/s_cbrtf.c
index 8bb1b8929dd6..c1c2fa1a370c 100644
--- a/lib/msun/src/s_cbrtf.c
+++ b/lib/msun/src/s_cbrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ceil.c b/lib/msun/src/s_ceil.c
index 2fc9bcceb66c..2c59c783c88d 100644
--- a/lib/msun/src/s_ceil.c
+++ b/lib/msun/src/s_ceil.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_ceilf.c b/lib/msun/src/s_ceilf.c
index 5925ee469b31..06993ad8c059 100644
--- a/lib/msun/src/s_ceilf.c
+++ b/lib/msun/src/s_ceilf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_copysign.c b/lib/msun/src/s_copysign.c
index c119edf9c220..4f758d229d5a 100644
--- a/lib/msun/src/s_copysign.c
+++ b/lib/msun/src/s_copysign.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_copysignf.c b/lib/msun/src/s_copysignf.c
index d5eb48f5c06a..ae0980fcaa80 100644
--- a/lib/msun/src/s_copysignf.c
+++ b/lib/msun/src/s_copysignf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_cos.c b/lib/msun/src/s_cos.c
index 7e4eda9e0473..707af78c97f8 100644
--- a/lib/msun/src/s_cos.c
+++ b/lib/msun/src/s_cos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* cos(x)
diff --git a/lib/msun/src/s_cosf.c b/lib/msun/src/s_cosf.c
index 18df5d0ed546..4091350e412b 100644
--- a/lib/msun/src/s_cosf.c
+++ b/lib/msun/src/s_cosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_erf.c b/lib/msun/src/s_erf.c
index 07129a3e102e..bfe5b12bba5c 100644
--- a/lib/msun/src/s_erf.c
+++ b/lib/msun/src/s_erf.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* double erf(double x)
diff --git a/lib/msun/src/s_erff.c b/lib/msun/src/s_erff.c
index 1a3b3b28d4eb..e9cc40951328 100644
--- a/lib/msun/src/s_erff.c
+++ b/lib/msun/src/s_erff.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_expm1.c b/lib/msun/src/s_expm1.c
index bff34926f902..adc879b0ecbb 100644
--- a/lib/msun/src/s_expm1.c
+++ b/lib/msun/src/s_expm1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* expm1(x)
diff --git a/lib/msun/src/s_expm1f.c b/lib/msun/src/s_expm1f.c
index e6d8709e12a0..0fc0699b9fc6 100644
--- a/lib/msun/src/s_expm1f.c
+++ b/lib/msun/src/s_expm1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_fabs.c b/lib/msun/src/s_fabs.c
index ef15a69506fc..74e59133685e 100644
--- a/lib/msun/src/s_fabs.c
+++ b/lib/msun/src/s_fabs.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_fabsf.c b/lib/msun/src/s_fabsf.c
index d064ba09188c..b14ae6e6c346 100644
--- a/lib/msun/src/s_fabsf.c
+++ b/lib/msun/src/s_fabsf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_finite.c b/lib/msun/src/s_finite.c
index b5429b4e17ee..88e3298d5d79 100644
--- a/lib/msun/src/s_finite.c
+++ b/lib/msun/src/s_finite.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_finitef.c b/lib/msun/src/s_finitef.c
index 0243993d488b..07038db67a59 100644
--- a/lib/msun/src/s_finitef.c
+++ b/lib/msun/src/s_finitef.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floor.c b/lib/msun/src/s_floor.c
index 37f0e1df0078..85ace779ede2 100644
--- a/lib/msun/src/s_floor.c
+++ b/lib/msun/src/s_floor.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_floorf.c b/lib/msun/src/s_floorf.c
index caa6427db09c..116ec1dd6cb8 100644
--- a/lib/msun/src/s_floorf.c
+++ b/lib/msun/src/s_floorf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_frexp.c b/lib/msun/src/s_frexp.c
index c6b5244e9812..178479d316f3 100644
--- a/lib/msun/src/s_frexp.c
+++ b/lib/msun/src/s_frexp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_frexpf.c b/lib/msun/src/s_frexpf.c
index 1a1df34adbb1..fbec6670ad96 100644
--- a/lib/msun/src/s_frexpf.c
+++ b/lib/msun/src/s_frexpf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c
index 9a10666d1d2c..d2c82650a88b 100644
--- a/lib/msun/src/s_ilogb.c
+++ b/lib/msun/src/s_ilogb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* ilogb(double x)
diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c
index 31c044396102..a912d1a28ff9 100644
--- a/lib/msun/src/s_ilogbf.c
+++ b/lib/msun/src/s_ilogbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c
index 212a5ee9348f..18cfcf2ac936 100644
--- a/lib/msun/src/s_isnan.c
+++ b/lib/msun/src/s_isnan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_isnanf.c b/lib/msun/src/s_isnanf.c
index 8432c0ef0f0e..0e48718a505a 100644
--- a/lib/msun/src/s_isnanf.c
+++ b/lib/msun/src/s_isnanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_ldexp.c b/lib/msun/src/s_ldexp.c
index 8fe2d4bf0266..463170114948 100644
--- a/lib/msun/src/s_ldexp.c
+++ b/lib/msun/src/s_ldexp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_ldexpf.c b/lib/msun/src/s_ldexpf.c
index ff01c1d57616..5091873072fb 100644
--- a/lib/msun/src/s_ldexpf.c
+++ b/lib/msun/src/s_ldexpf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_lib_version.c b/lib/msun/src/s_lib_version.c
index b9ca845d3147..29269d3d4fda 100644
--- a/lib/msun/src/s_lib_version.c
+++ b/lib/msun/src/s_lib_version.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_log1p.c b/lib/msun/src/s_log1p.c
index 07bc93a4fc3e..0a60f9512607 100644
--- a/lib/msun/src/s_log1p.c
+++ b/lib/msun/src/s_log1p.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* double log1p(double x)
diff --git a/lib/msun/src/s_log1pf.c b/lib/msun/src/s_log1pf.c
index 54b3c610df93..2923d016c58a 100644
--- a/lib/msun/src/s_log1pf.c
+++ b/lib/msun/src/s_log1pf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_logb.c b/lib/msun/src/s_logb.c
index aac20e3b837b..8b724f49594c 100644
--- a/lib/msun/src/s_logb.c
+++ b/lib/msun/src/s_logb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_logbf.c b/lib/msun/src/s_logbf.c
index 5769e2dfbd1f..1d345437bb2c 100644
--- a/lib/msun/src/s_logbf.c
+++ b/lib/msun/src/s_logbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_matherr.c b/lib/msun/src/s_matherr.c
index fbc5664bde50..3f7a8275cd14 100644
--- a/lib/msun/src/s_matherr.c
+++ b/lib/msun/src/s_matherr.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_modf.c b/lib/msun/src/s_modf.c
index d82cda3faddd..50a261d71569 100644
--- a/lib/msun/src/s_modf.c
+++ b/lib/msun/src/s_modf.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_modff.c b/lib/msun/src/s_modff.c
index 8fd9bb0d2ba5..bedb49ffb7dd 100644
--- a/lib/msun/src/s_modff.c
+++ b/lib/msun/src/s_modff.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_nextafter.c b/lib/msun/src/s_nextafter.c
index 877f7b8d18e9..a54b82312a4e 100644
--- a/lib/msun/src/s_nextafter.c
+++ b/lib/msun/src/s_nextafter.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* IEEE functions
diff --git a/lib/msun/src/s_nextafterf.c b/lib/msun/src/s_nextafterf.c
index e9fd541066ba..d976a20167c2 100644
--- a/lib/msun/src/s_nextafterf.c
+++ b/lib/msun/src/s_nextafterf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c
index a2891027b8e4..aa4145209528 100644
--- a/lib/msun/src/s_rint.c
+++ b/lib/msun/src/s_rint.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_rintf.c b/lib/msun/src/s_rintf.c
index 9db496a9256f..3bb8b1cd374b 100644
--- a/lib/msun/src/s_rintf.c
+++ b/lib/msun/src/s_rintf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_scalbn.c b/lib/msun/src/s_scalbn.c
index 3159215be411..b69bdcd58cdb 100644
--- a/lib/msun/src/s_scalbn.c
+++ b/lib/msun/src/s_scalbn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_scalbnf.c b/lib/msun/src/s_scalbnf.c
index af1b099e6839..7dd75956df3f 100644
--- a/lib/msun/src/s_scalbnf.c
+++ b/lib/msun/src/s_scalbnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_significand.c b/lib/msun/src/s_significand.c
index 4bbf36dff2f9..64d4623e857f 100644
--- a/lib/msun/src/s_significand.c
+++ b/lib/msun/src/s_significand.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/s_significandf.c b/lib/msun/src/s_significandf.c
index ce46be80bd1d..73cfa71c33b3 100644
--- a/lib/msun/src/s_significandf.c
+++ b/lib/msun/src/s_significandf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_sin.c b/lib/msun/src/s_sin.c
index d12a49509cb0..e6b099edb527 100644
--- a/lib/msun/src/s_sin.c
+++ b/lib/msun/src/s_sin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* sin(x)
diff --git a/lib/msun/src/s_sinf.c b/lib/msun/src/s_sinf.c
index d6ac1a0dec62..ba3adffc1b60 100644
--- a/lib/msun/src/s_sinf.c
+++ b/lib/msun/src/s_sinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_tan.c b/lib/msun/src/s_tan.c
index f63a213f2d84..e02584e3116f 100644
--- a/lib/msun/src/s_tan.c
+++ b/lib/msun/src/s_tan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* tan(x)
diff --git a/lib/msun/src/s_tanf.c b/lib/msun/src/s_tanf.c
index e7f51c73a565..65ab1bf925e0 100644
--- a/lib/msun/src/s_tanf.c
+++ b/lib/msun/src/s_tanf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_tanh.c b/lib/msun/src/s_tanh.c
index 8eb3197a2085..4f58fcffeecb 100644
--- a/lib/msun/src/s_tanh.c
+++ b/lib/msun/src/s_tanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* Tanh(x)
diff --git a/lib/msun/src/s_tanhf.c b/lib/msun/src/s_tanhf.c
index f8b41c89bf7f..cdfd5f6c09aa 100644
--- a/lib/msun/src/s_tanhf.c
+++ b/lib/msun/src/s_tanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_acos.c b/lib/msun/src/w_acos.c
index 21f2ff4daf45..3e8c6e53cf69 100644
--- a/lib/msun/src/w_acos.c
+++ b/lib/msun/src/w_acos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acosf.c b/lib/msun/src/w_acosf.c
index 70d2f130f81b..c2292c655d5f 100644
--- a/lib/msun/src/w_acosf.c
+++ b/lib/msun/src/w_acosf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acosh.c b/lib/msun/src/w_acosh.c
index 5533f2204771..197d6d75e2fa 100644
--- a/lib/msun/src/w_acosh.c
+++ b/lib/msun/src/w_acosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_acoshf.c b/lib/msun/src/w_acoshf.c
index 73b2f06c2d29..08798899ff31 100644
--- a/lib/msun/src/w_acoshf.c
+++ b/lib/msun/src/w_acoshf.c
@@ -15,7 +15,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_asin.c b/lib/msun/src/w_asin.c
index 3620c0043b64..d5b25238ab2d 100644
--- a/lib/msun/src/w_asin.c
+++ b/lib/msun/src/w_asin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_asinf.c b/lib/msun/src/w_asinf.c
index 02392bbb3234..6972cb9d6b3d 100644
--- a/lib/msun/src/w_asinf.c
+++ b/lib/msun/src/w_asinf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atan2.c b/lib/msun/src/w_atan2.c
index 1405d1c25f15..8f4c826f494e 100644
--- a/lib/msun/src/w_atan2.c
+++ b/lib/msun/src/w_atan2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atan2f.c b/lib/msun/src/w_atan2f.c
index bba9f3b30381..45e5a14d9b99 100644
--- a/lib/msun/src/w_atan2f.c
+++ b/lib/msun/src/w_atan2f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atanh.c b/lib/msun/src/w_atanh.c
index ba2aca927dc5..d96c9b77cee4 100644
--- a/lib/msun/src/w_atanh.c
+++ b/lib/msun/src/w_atanh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_atanhf.c b/lib/msun/src/w_atanhf.c
index 9556e3457b52..9da087b28517 100644
--- a/lib/msun/src/w_atanhf.c
+++ b/lib/msun/src/w_atanhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_cosh.c b/lib/msun/src/w_cosh.c
index 07116877e336..f20d4c52c4a2 100644
--- a/lib/msun/src/w_cosh.c
+++ b/lib/msun/src/w_cosh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_coshf.c b/lib/msun/src/w_coshf.c
index 385bcfa931ee..61e74f8c7c99 100644
--- a/lib/msun/src/w_coshf.c
+++ b/lib/msun/src/w_coshf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_exp.c b/lib/msun/src/w_exp.c
index 4496acba1057..7d1e74b5a711 100644
--- a/lib/msun/src/w_exp.c
+++ b/lib/msun/src/w_exp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_expf.c b/lib/msun/src/w_expf.c
index a775ac6a3029..07bd13b73ffb 100644
--- a/lib/msun/src/w_expf.c
+++ b/lib/msun/src/w_expf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_fmod.c b/lib/msun/src/w_fmod.c
index b4200632a433..4ee45a16745e 100644
--- a/lib/msun/src/w_fmod.c
+++ b/lib/msun/src/w_fmod.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_fmodf.c b/lib/msun/src/w_fmodf.c
index 3cf05ed1df48..b948ee17ae5d 100644
--- a/lib/msun/src/w_fmodf.c
+++ b/lib/msun/src/w_fmodf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_gamma.c b/lib/msun/src/w_gamma.c
index fd44c1cd822c..fb3d12709d89 100644
--- a/lib/msun/src/w_gamma.c
+++ b/lib/msun/src/w_gamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* double gamma(double x)
diff --git a/lib/msun/src/w_gamma_r.c b/lib/msun/src/w_gamma_r.c
index fa59f8d8a49f..2f10023b3191 100644
--- a/lib/msun/src/w_gamma_r.c
+++ b/lib/msun/src/w_gamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_gammaf.c b/lib/msun/src/w_gammaf.c
index e956f516d38a..0e579c78c73f 100644
--- a/lib/msun/src/w_gammaf.c
+++ b/lib/msun/src/w_gammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_gammaf_r.c b/lib/msun/src/w_gammaf_r.c
index b8c1e12b9dd6..aa71d6987d18 100644
--- a/lib/msun/src/w_gammaf_r.c
+++ b/lib/msun/src/w_gammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_hypot.c b/lib/msun/src/w_hypot.c
index a434a1df7c3c..6486c8ded645 100644
--- a/lib/msun/src/w_hypot.c
+++ b/lib/msun/src/w_hypot.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_hypotf.c b/lib/msun/src/w_hypotf.c
index 7987740ae820..77c055d020eb 100644
--- a/lib/msun/src/w_hypotf.c
+++ b/lib/msun/src/w_hypotf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j0.c b/lib/msun/src/w_j0.c
index 1b2260b24ced..e1a4f85c7eee 100644
--- a/lib/msun/src/w_j0.c
+++ b/lib/msun/src/w_j0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j0f.c b/lib/msun/src/w_j0f.c
index f332e2dc7c23..2c6df51806b9 100644
--- a/lib/msun/src/w_j0f.c
+++ b/lib/msun/src/w_j0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j1.c b/lib/msun/src/w_j1.c
index 068ac94217c7..86f1a3f71d9e 100644
--- a/lib/msun/src/w_j1.c
+++ b/lib/msun/src/w_j1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_j1f.c b/lib/msun/src/w_j1f.c
index 87995e3792ce..8ef1478dc21d 100644
--- a/lib/msun/src/w_j1f.c
+++ b/lib/msun/src/w_j1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_jn.c b/lib/msun/src/w_jn.c
index a575700ca0e9..0b087e512b48 100644
--- a/lib/msun/src/w_jn.c
+++ b/lib/msun/src/w_jn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_jnf.c b/lib/msun/src/w_jnf.c
index 3d1a3d52f601..9ce1bede7c82 100644
--- a/lib/msun/src/w_jnf.c
+++ b/lib/msun/src/w_jnf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_lgamma.c b/lib/msun/src/w_lgamma.c
index 88ab418baf0a..3ee3999b839b 100644
--- a/lib/msun/src/w_lgamma.c
+++ b/lib/msun/src/w_lgamma.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* double lgamma(double x)
diff --git a/lib/msun/src/w_lgamma_r.c b/lib/msun/src/w_lgamma_r.c
index 74cdfba97048..80fd27e0eecc 100644
--- a/lib/msun/src/w_lgamma_r.c
+++ b/lib/msun/src/w_lgamma_r.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_lgammaf.c b/lib/msun/src/w_lgammaf.c
index b8f66e605311..7a237ca0c373 100644
--- a/lib/msun/src/w_lgammaf.c
+++ b/lib/msun/src/w_lgammaf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/w_lgammaf_r.c b/lib/msun/src/w_lgammaf_r.c
index f955dfbec29a..2646669a1a59 100644
--- a/lib/msun/src/w_lgammaf_r.c
+++ b/lib/msun/src/w_lgammaf_r.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log.c b/lib/msun/src/w_log.c
index 9440eb6128a4..7150aaa70c11 100644
--- a/lib/msun/src/w_log.c
+++ b/lib/msun/src/w_log.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log10.c b/lib/msun/src/w_log10.c
index c6910b3226ea..e6cdca11da02 100644
--- a/lib/msun/src/w_log10.c
+++ b/lib/msun/src/w_log10.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_log10f.c b/lib/msun/src/w_log10f.c
index 96057e178381..b5f1247663d4 100644
--- a/lib/msun/src/w_log10f.c
+++ b/lib/msun/src/w_log10f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_logf.c b/lib/msun/src/w_logf.c
index 5e66a7d6422d..dee641b01675 100644
--- a/lib/msun/src/w_logf.c
+++ b/lib/msun/src/w_logf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_powf.c b/lib/msun/src/w_powf.c
index d6e48d895cd7..24a2cf442163 100644
--- a/lib/msun/src/w_powf.c
+++ b/lib/msun/src/w_powf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_remainder.c b/lib/msun/src/w_remainder.c
index 26b0a2eaa6a4..7d40df436220 100644
--- a/lib/msun/src/w_remainder.c
+++ b/lib/msun/src/w_remainder.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_remainderf.c b/lib/msun/src/w_remainderf.c
index 496bb1ffea5e..9cc28d4c1905 100644
--- a/lib/msun/src/w_remainderf.c
+++ b/lib/msun/src/w_remainderf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_scalb.c b/lib/msun/src/w_scalb.c
index 5fe8033b4fc8..c12b5e82f256 100644
--- a/lib/msun/src/w_scalb.c
+++ b/lib/msun/src/w_scalb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_scalbf.c b/lib/msun/src/w_scalbf.c
index 64a69940b936..357850303d86 100644
--- a/lib/msun/src/w_scalbf.c
+++ b/lib/msun/src/w_scalbf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sinh.c b/lib/msun/src/w_sinh.c
index e222a0244148..7ed5ec786651 100644
--- a/lib/msun/src/w_sinh.c
+++ b/lib/msun/src/w_sinh.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sinhf.c b/lib/msun/src/w_sinhf.c
index 4bcd9ae67a68..345440d6442e 100644
--- a/lib/msun/src/w_sinhf.c
+++ b/lib/msun/src/w_sinhf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sqrt.c b/lib/msun/src/w_sqrt.c
index b4cf0a63a898..f9b08a41bf05 100644
--- a/lib/msun/src/w_sqrt.c
+++ b/lib/msun/src/w_sqrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_sqrtf.c b/lib/msun/src/w_sqrtf.c
index d24fc8cc7c0f..1b50a1833ceb 100644
--- a/lib/msun/src/w_sqrtf.c
+++ b/lib/msun/src/w_sqrtf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y0.c b/lib/msun/src/w_y0.c
index 91b9760a1d8b..d2da8ce9b4f4 100644
--- a/lib/msun/src/w_y0.c
+++ b/lib/msun/src/w_y0.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y0f.c b/lib/msun/src/w_y0f.c
index 52ed04113bb0..a716441ab9bd 100644
--- a/lib/msun/src/w_y0f.c
+++ b/lib/msun/src/w_y0f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y1.c b/lib/msun/src/w_y1.c
index b46d81e9282c..cde47aacaacf 100644
--- a/lib/msun/src/w_y1.c
+++ b/lib/msun/src/w_y1.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_y1f.c b/lib/msun/src/w_y1f.c
index b4e4633d68ac..0b8f33225c13 100644
--- a/lib/msun/src/w_y1f.c
+++ b/lib/msun/src/w_y1f.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_yn.c b/lib/msun/src/w_yn.c
index af0337657bdd..2323d26ffb56 100644
--- a/lib/msun/src/w_yn.c
+++ b/lib/msun/src/w_yn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /*
diff --git a/lib/msun/src/w_ynf.c b/lib/msun/src/w_ynf.c
index 0597b92ce2de..f7a24981c310 100644
--- a/lib/msun/src/w_ynf.c
+++ b/lib/msun/src/w_ynf.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "math.h"
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 949d61759e8d..30886f5866fa 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ncurses
-# $Id: Makefile,v 1.24 1997/10/20 17:53:54 ache Exp $
+# $FreeBSD$
 
 LIB=    ncurses
 SHLIB_MAJOR= 3
diff --git a/libexec/Makefile b/libexec/Makefile
index 991501ac4f08..9301dc065176 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.36 1998/09/05 08:33:10 jb Exp $
+# $FreeBSD$
 
 # Present but disabled: kpasswdd
 SUBDIR=	atrun bootpd comsat fingerd ftpd getNAME getty \
diff --git a/libexec/atrun/LEGAL b/libexec/atrun/LEGAL
index 2cd9453a7c34..af8be572d5cd 100644
--- a/libexec/atrun/LEGAL
+++ b/libexec/atrun/LEGAL
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 -----BEGIN PGP SIGNED MESSAGE-----
 
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index 118bed195042..563e10196549 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 MAINSRC= ${.CURDIR}/../../usr.bin/at
 
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index d8e3a862088c..ae9ebc916a90 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: atrun.c,v 1.12 1997/11/20 07:21:50 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* System Headers */
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index 5f7d8107c77a..a157f2af4cb5 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -1,4 +1,4 @@
-.\" $Id: atrun.man,v 1.5 1998/07/01 05:47:58 jkoshy Exp $
+.\" $FreeBSD$
 .Dd April 12, 1995
 .Dt ATRUN 8
 .Os FreeBSD 2.1
diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c
index 40e871397eeb..6cffe5a4cfec 100644
--- a/libexec/atrun/gloadavg.c
+++ b/libexec/atrun/gloadavg.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifndef __FreeBSD__
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h
index 24c4e12a8ad5..48890ce54b59 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[] = "$Id$";
+static char atrun_h_rcsid[] = "$FreeBSD$";
 #endif
diff --git a/libexec/bootpd/Announce b/libexec/bootpd/Announce
index a605c6a98fda..60838d5e978e 100644
--- a/libexec/bootpd/Announce
+++ b/libexec/bootpd/Announce
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 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 23310e1cf285..d797ea1fa9e5 100644
--- a/libexec/bootpd/Changes
+++ b/libexec/bootpd/Changes
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 Changes, most recent first
 Date, <email> Real Name
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index bc0722589ab1..f428be888778 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -1,5 +1,5 @@
 # bootpd/Makefile
-# $Id$
+# $FreeBSD$
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS
diff --git a/libexec/bootpd/Makefile.UNIX b/libexec/bootpd/Makefile.UNIX
index 50187dae4588..5b2c186bcb4b 100644
--- a/libexec/bootpd/Makefile.UNIX
+++ b/libexec/bootpd/Makefile.UNIX
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 # Makefile for the BOOTP programs:
 #   bootpd	- BOOTP server daemon
diff --git a/libexec/bootpd/Makefile.inc b/libexec/bootpd/Makefile.inc
index d055f527cdef..829da300445d 100644
--- a/libexec/bootpd/Makefile.inc
+++ b/libexec/bootpd/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id$
+# $FreeBSD$
 
 BINDIR?=	/usr/libexec
diff --git a/libexec/bootpd/Problems b/libexec/bootpd/Problems
index bec9ac0faa1c..c7f9951946b3 100644
--- a/libexec/bootpd/Problems
+++ b/libexec/bootpd/Problems
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 Common problems and ways to work around them:
 
diff --git a/libexec/bootpd/README b/libexec/bootpd/README
index ddfaebe9bab3..a88cca5b6450 100644
--- a/libexec/bootpd/README
+++ b/libexec/bootpd/README
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 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 88f7ed28c466..6ff568087511 100644
--- a/libexec/bootpd/bootp.h
+++ b/libexec/bootpd/bootp.h
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1395.
  *
- * $Id$
+ * $FreeBSD$
  *
  *
  * This file specifies the "implementation-independent" BOOTP protocol
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index faef843b14cb..5630167d6cec 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Id: bootpd.8,v 1.8 1998/02/03 07:30:22 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 06, 1993
 .Dt BOOTPD 8
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index ed0dee3e48eb..216e08f18f4f 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-	$Id: bootpd.c,v 1.11 1999/04/07 08:27:39 brian Exp $
+ $FreeBSD$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile
index 04f02ebc965e..4a658533741f 100644
--- a/libexec/bootpd/bootpgw/Makefile
+++ b/libexec/bootpd/bootpgw/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $Id$
+# $FreeBSD$
 
 PROG=	bootpgw
 NOMAN=  true
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index 31174b66647d..eee489d74e28 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Id: bootptab.5,v 1.2 1998/02/03 07:30:22 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 31, 1991
 .Dt BOOTPTAB 5
diff --git a/libexec/bootpd/bootptab.mcs b/libexec/bootpd/bootptab.mcs
index a798f8afa9e1..9bce37e07f29 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.
 #
-#	$Id$
+# $FreeBSD$
 #
 # Legend:	(see bootptab.5)
 #	first field -- hostname (not indented)
diff --git a/libexec/bootpd/dovend.c b/libexec/bootpd/dovend.c
index 447826f3ca0e..9c8457b74908 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.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
index 4278ba10736e..5fa832098062 100644
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -1,7 +1,7 @@
 /*
  * dumptab.c - handles dumping the database
  *
- *	$Id: dumptab.c,v 1.4 1997/02/22 14:21:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c
index 8f31bcbbe09f..8f95a59292ad 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>
  *
- *	$Id: getether.c,v 1.7 1997/02/22 14:21:05 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getif.c b/libexec/bootpd/getif.c
index ecfa6107440e..ec7cd8f716db 100644
--- a/libexec/bootpd/getif.c
+++ b/libexec/bootpd/getif.c
@@ -1,7 +1,7 @@
 /*
  * getif.c : get an interface structure
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c
index f9597513f8b9..16b042032e76 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.
 
-	$Id$
+ $FreeBSD$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/hwaddr.c b/libexec/bootpd/hwaddr.c
index b4fe5e4c393e..9a9de1a98cb5 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)
  *
- *	$Id: hwaddr.c,v 1.5 1997/02/22 14:21:07 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hwaddr.h b/libexec/bootpd/hwaddr.h
index b0a8c290801b..200427356e48 100644
--- a/libexec/bootpd/hwaddr.h
+++ b/libexec/bootpd/hwaddr.h
@@ -1,7 +1,7 @@
 /* 
  * hwaddr.h
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	HWADDR_H
diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
index af3b37aa99a6..54b3f62242f7 100644
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -1,7 +1,7 @@
 /*
  * lookup.c - Lookup IP address, HW address, netmask
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/patchlevel.h b/libexec/bootpd/patchlevel.h
index 85566b5015a9..fc79f18b4068 100644
--- a/libexec/bootpd/patchlevel.h
+++ b/libexec/bootpd/patchlevel.h
@@ -1,7 +1,7 @@
 /* 
  * patchlevel.h 
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define VERSION 	"2.4"
diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c
index 8d895fd0e906..58c65b57edeb 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.
 
-	$Id: readfile.c,v 1.4 1997/02/22 14:21:09 peter Exp $
+ $FreeBSD$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index e9702bb0d0a2..40b872864cfd 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -39,7 +39,7 @@
 
 /*
  * from arp.c	8.2 (Berkeley) 1/2/94
- * $Id: rtmsg.c,v 1.8 1997/02/22 14:21:09 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/bootpd/tools/Makefile b/libexec/bootpd/tools/Makefile
index b1f38e76ecbd..e905bffa7696 100644
--- a/libexec/bootpd/tools/Makefile
+++ b/libexec/bootpd/tools/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $Id$
+# $FreeBSD$
 
 SUBDIR=	bootpef bootptest
 
diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc
index 0a2ab66f28f4..16007eec373b 100644
--- a/libexec/bootpd/tools/Makefile.inc
+++ b/libexec/bootpd/tools/Makefile.inc
@@ -1,4 +1,4 @@
 # Makefile.inc
-# $Id$
+# $FreeBSD$
 
 BINDIR=/usr/sbin
diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile
index 7d176069a8d6..dfb766255864 100644
--- a/libexec/bootpd/tools/bootpef/Makefile
+++ b/libexec/bootpd/tools/bootpef/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $Id$
+# $FreeBSD$
 
 PROG=	bootpef
 MAN8=	bootpef.8
diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c
index c459ac8e6900..893efd87ea35 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.
 
-	$Id: bootpef.c,v 1.4 1997/02/22 14:21:18 peter Exp $
+ $FreeBSD$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile
index 148a556b1926..1bc8887432f2 100644
--- a/libexec/bootpd/tools/bootptest/Makefile
+++ b/libexec/bootpd/tools/bootptest/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $Id$
+# $FreeBSD$
 
 PROG=	bootptest
 MAN8=	bootptest.8
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index d319426b4aa3..f56a095b73d2 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.c
+++ b/libexec/bootpd/tools/bootptest/bootptest.c
@@ -31,7 +31,7 @@
  * 09/28/93 Released version 1.0
  * 09/93 Original developed by Gordon W. Ross <gwr@mc.com>
  *
- *	$Id: bootptest.c,v 1.5 1997/12/24 18:56:03 imp Exp $
+ * $FreeBSD$
  */
 
 char *usage = "bootptest [-h] server-name [vendor-data-template-file]";
diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c
index c8e1c2eb44f0..977a32dd4165 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>
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/libexec/bootpd/trygetea.c b/libexec/bootpd/trygetea.c
index 41800d78c126..0ae63a3a2fba 100644
--- a/libexec/bootpd/trygetea.c
+++ b/libexec/bootpd/trygetea.c
@@ -1,7 +1,7 @@
 /*
  * trygetea.c - test program for getether.c
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trygetif.c b/libexec/bootpd/trygetif.c
index e6226dcb9ef0..0e2cca195b23 100644
--- a/libexec/bootpd/trygetif.c
+++ b/libexec/bootpd/trygetif.c
@@ -1,7 +1,7 @@
 /*
  * trygetif.c - test program for getif.c
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trylook.c b/libexec/bootpd/trylook.c
index 0681dceebbc4..9484d04b6da3 100644
--- a/libexec/bootpd/trylook.c
+++ b/libexec/bootpd/trylook.c
@@ -1,7 +1,7 @@
 /*
  * trylook.c - test program for lookup.c
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index 7352ab55103a..d3a6740c4677 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	comsat
 MAN8=	comsat.8
diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8
index 916d1c90d064..eb0d7d30cd0f 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt COMSAT 8
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index a199f58b6865..ab920a21f553 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[] =
-	"$Id: comsat.c,v 1.11 1997/11/20 07:23:44 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index 793cfc32e5ab..6c78d8d4c5a4 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.5 1997/02/22 14:21:24 peter Exp $
+# $FreeBSD$
 
 PROG=	fingerd
 DPADD=	${LIBUTIL}
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index e65f283fc526..aa71613e1ea3 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[] =
-	"$Id: fingerd.c,v 1.13 1999/04/07 06:00:22 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index f25478b3d9bf..e239286200b6 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-#	$Id: Makefile,v 1.25 1998/11/21 02:11:16 jdp Exp $
+# $FreeBSD$
 
 PROG=	ftpd
 MAN8=	ftpd.8
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index e27dae422d9e..9888cb6946b6 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
- *	$Id: extern.h,v 1.11 1997/09/05 11:43:56 tg Exp $
+ * $FreeBSD$
  */
 
 void	blkfree __P((char **));
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 51a6f44623f5..359fa81dca20 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -45,7 +45,7 @@
 static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index fab310852063..8f2cca788ad5 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
-.\"	$Id: ftpd.8,v 1.27 1999/06/28 10:50:47 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt FTPD 8
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 01502838a55d..7ce5abb5e2ff 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: ftpd.c,v 1.55 1999/04/25 22:23:35 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 5c9cd3fc2a3f..d3f2ec56c883 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index d2f8b737b570..a8837a90c446 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
- *	$Id: pathnames.h,v 1.9 1997/04/26 12:12:10 davidn Exp $
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 6b212158678c..606d17a421d6 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: popen.c,v 1.15 1998/05/18 00:06:28 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/skey-stuff.c b/libexec/ftpd/skey-stuff.c
index 30faa9e29e77..f06a4150e2ce 100644
--- a/libexec/ftpd/skey-stuff.c
+++ b/libexec/ftpd/skey-stuff.c
@@ -3,7 +3,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: skey-stuff.c,v 1.10 1997/11/21 07:38:43 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/getNAME/Makefile b/libexec/getNAME/Makefile
index 6600d2386463..a88492c48eb9 100644
--- a/libexec/getNAME/Makefile
+++ b/libexec/getNAME/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $Id$
+# $FreeBSD$
 
 PROG=	getNAME
 
diff --git a/libexec/getNAME/getNAME.1 b/libexec/getNAME/getNAME.1
index d292ab6d31fd..27e85bd13ba8 100644
--- a/libexec/getNAME/getNAME.1
+++ b/libexec/getNAME/getNAME.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: getNAME.1,v 1.6 1997/02/22 14:21:34 peter Exp $
+.\" $FreeBSD$
 
 .Dd July 8, 1996
 .Dt getNAME 1
diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c
index 87da702364dd..3fd63bdb6b79 100644
--- a/libexec/getNAME/getNAME.c
+++ b/libexec/getNAME/getNAME.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)getNAME.c	8.1 (Berkeley) 6/30/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index f51fe2418fec..595ae44a0d5e 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	getty
 SRCS=	main.c init.c subr.c chat.c
diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c
index af509f0582b5..1fdef26ef44a 100644
--- a/libexec/getty/chat.c
+++ b/libexec/getty/chat.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index bd84a130845e..94fe3cc127c5 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
- *	$Id$
+ * $FreeBSD$
  */
 
 struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index 5492a9166b2e..bd81c0422035 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
-.\"	$Id: getty.8,v 1.8 1997/08/17 16:36:41 steve Exp $
+.\" $FreeBSD$
 .\" "
 .Dd June 4, 1993
 .Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 1a09d4359a6c..6a80b6741dcc 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
-.\"	$Id: gettytab.5,v 1.18 1998/06/10 12:34:25 phk Exp $
+.\" $FreeBSD$
 .\" "
 .Dd April 19, 1994
 .Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index 1323f67e0d3e..b0a65e8cc685 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
- *	$Id: gettytab.h,v 1.8 1997/02/22 14:21:38 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index 3f279fac6c9c..d06378b139fc 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[] =
-	"$Id: init.c,v 1.9 1997/11/21 07:43:49 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index cf1bf2998ba7..0eac55b56907 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[] =
-	"$Id: main.c,v 1.25 1999/04/04 04:36:50 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index fd397dd60a8b..035e8b6c14b3 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
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index c5246b78a516..13c7bd060293 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[] =
-	"$Id: subr.c,v 1.13 1997/11/21 07:43:52 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index 11233704a24f..502decb37f3c 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
-.\"	$Id: ttys.5,v 1.8 1997/06/02 21:03:20 davidn Exp $
+.\" $FreeBSD$
 .\" "
 .Dd November 17, 1996
 .Dt TTYS 5
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index 02f33fc1aaee..1e902803f8f6 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.8 1998/08/04 15:30:17 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../contrib/sendmail/mail.local \
 	${.CURDIR}/../../contrib/sendmail/src
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index 2ec0edde9e0f..2028c6dad80b 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	makekey
 MAN8=	makekey.8
diff --git a/libexec/makekey/makekey.8 b/libexec/makekey/makekey.8
index 73f444f2b90a..9a85c22f19cb 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
-.\"	$Id: makekey.8,v 1.7 1997/02/22 14:21:50 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt MAKEKEY 8
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index c04abc496db9..5f9dc04b18a7 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[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile
index db5999b08ae5..3f5592087b75 100644
--- a/libexec/mknetid/Makefile
+++ b/libexec/mknetid/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	mknetid
 SRCS=	mknetid.c hash.c parse_group.c
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index 989fdb3775dc..8de336f3d5ab 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index 5f6cd2e98cd2..04bc784c5c11 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.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Groupid entry hung off a member_entry node. */
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index 9ef61fd276eb..a3e3d99ef1a4 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.
 .\"
-.\"	$Id: mknetid.8,v 1.5 1998/03/19 07:37:10 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 23, 1996
 .Dt MKNETID 8
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 4b8a3280c2b8..23414513ad08 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mknetid.c,v 1.9 1997/12/15 07:19:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #define LINSIZ 1024
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index 5d2917dd1278..327847426b8e 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[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/named-xfer/Makefile b/libexec/named-xfer/Makefile
index 0e3c307ffea1..62ed91a4db3c 100644
--- a/libexec/named-xfer/Makefile
+++ b/libexec/named-xfer/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1998/05/04 05:12:49 peter Exp $
+# $FreeBSD$
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile
index 0cc5ac279374..f4ad590f046a 100644
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.7 1997/02/22 14:21:57 peter Exp $
+# $FreeBSD$
 
 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 758e421b4bd8..98d6e00908ee 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[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c
index e2d964330f3e..74ff341095f9 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[] =
-	"$Id: conf.c,v 1.3 1997/11/24 07:33:40 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 1260c29b9a0b..21e4c0b1b2a1 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[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8
index df5adcc4b638..c18558d42f22 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
-.\"	$Id: rbootd.8,v 1.7 1997/06/29 19:00:13 steve Exp $
+.\" $FreeBSD$
 .\"
 .\" 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 b8e384d7dc4d..2f7c38435364 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[] =
-	"$Id: rbootd.c,v 1.9 1997/11/24 07:33:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 989ba8649e08..80ce805db586 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[] =
-	"$Id: rmpproto.c,v 1.4 1997/11/24 07:33:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c
index 9dbcf2056930..936451385930 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[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile
index dec0e7b8e653..9c41089c0648 100644
--- a/libexec/revnetgroup/Makefile
+++ b/libexec/revnetgroup/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	revnetgroup
 SRCS=	revnetgroup.c hash.c parse_netgroup.c
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index 093b44a07828..c11244ac3b9c 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index 7106967d99e5..04a44d67a8fa 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.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Groupname entry hung off a member_entry node. */
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index 19a90108af2a..6b795c61d8a6 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/revnetgroup/revnetgroup.8 b/libexec/revnetgroup/revnetgroup.8
index 5944f4b1e1ea..62953e21de00 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.
 .\"
-.\"	$Id: revnetgroup.8,v 1.5 1997/11/25 07:14:34 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 24, 1995
 .Dt REVNETGROUP 8
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 3599acd18c6a..eccdada23c58 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index 9dd048de18af..fa5203ca98b6 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.8 1997/02/22 14:22:05 peter Exp $
+# $FreeBSD$
 
 PROG=	rexecd
 MAN8=	rexecd.8
diff --git a/libexec/rexecd/rexecd.8 b/libexec/rexecd/rexecd.8
index eacc08a0f1de..4c8626852df2 100644
--- a/libexec/rexecd/rexecd.8
+++ b/libexec/rexecd/rexecd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexecd.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: rexecd.8,v 1.7 1997/02/22 14:22:05 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 23, 1994
 .Dt REXECD 8
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 8c8c06bded17..10c2f2be98c6 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rexecd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: rexecd.c,v 1.16 1999/04/06 23:05:57 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 2685f8430530..a5deb98acefa 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.9 1998/08/06 21:35:47 markm Exp $
+# $FreeBSD$
 
 PROG=	rlogind
 SRCS=	rlogind.c
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index 4f8ae93e0cb6..7eebc2bb6d0f 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
-.\"	$Id: rlogind.8,v 1.9 1997/11/25 07:17:13 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RLOGIND 8
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 70febc0b9ebb..a99ac7ec0a55 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rlogind.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: rlogind.c,v 1.24 1999/08/21 18:15:55 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 53ca412a46ee..1bda56af794d 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
diff --git a/libexec/rpc.rquotad/rpc.rquotad.8 b/libexec/rpc.rquotad/rpc.rquotad.8
index 4a2aa3059229..a4fa2c07be93 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.
 .\"
-.\"	$Id: rpc.rquotad.8,v 1.4 1997/03/14 06:09:04 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 22, 1994
 .Dt RPC.RQUOTAD 8
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index 926d30089c2c..aba357ac4f15 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index efef47ac9918..d4b71ea1b8d7 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 14:22:11 peter Exp $
+# $FreeBSD$
 
 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 88972321d5ed..8860e5541bdb 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.
 .\"
-.\"	$Id: rpc.rstatd.8,v 1.3 1997/02/22 14:22:12 peter Exp $
+.\" $FreeBSD$
 .\"
 .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 16e060c4de20..7f6bd554f063 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[] =
-	"$Id: rstat_proc.c,v 1.12 1998/09/16 21:33:14 dfr Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index ede8d50bdb84..21a0d5640428 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rstatd.c,v 1.6 1997/11/26 07:34:56 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index 48f38531dd9c..fefc7bfa1d5f 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 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 c303eef4f380..1775cddd4390 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.
 .\"
-.\"	$Id: rpc.rusersd.8,v 1.4 1997/02/22 14:22:16 peter Exp $
+.\" $FreeBSD$
 .\"
 .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 e61e52cefad7..404221796d53 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[] =
-	"$Id: rusers_proc.c,v 1.8 1998/01/07 07:54:17 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifdef DEBUG
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 5d96f9eb1485..9482692a1feb 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rusersd.c,v 1.6 1997/11/26 07:36:51 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index f9bf277da151..8a0b75c3eedc 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG =	rpc.rwalld
 SRCS =	rwalld.c
diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8
index 31204f5c24ec..116142e46dd9 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.
 .\"
-.\"	$Id: rpc.rwalld.8,v 1.3 1997/02/22 14:22:18 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 7, 1993
 .Dt RPC.RWALLD 8
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index f94f4a6148b6..985dca93e640 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rwalld.c,v 1.6 1997/12/02 12:20:17 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 233c4d8f91e5..80d73302349d 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG =	rpc.sprayd
 SRCS =	sprayd.c
diff --git a/libexec/rpc.sprayd/rpc.sprayd.8 b/libexec/rpc.sprayd/rpc.sprayd.8
index 5979b44758ec..ebf838263adc 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.
 .\"
-.\"	$Id: rpc.sprayd.8,v 1.4 1997/02/22 14:22:20 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 22, 1994
 .Dt RPC.SPRAYD 8
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index b6e5fd1ec6e2..a6324e86c3d9 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index d9bfb79eb388..fece4b80a2e1 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.9 1998/08/06 21:36:25 markm Exp $
+# $FreeBSD$
 
 PROG=	rshd
 SRCS=	rshd.c
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index 7af12ecccb2f..e349ea0c7b33 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
-.\"	$Id: rshd.8,v 1.14 1998/12/16 07:20:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 24b7d35d775e..c2afeb528fa1 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rshd.c	8.2 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: rshd.c,v 1.24 1999/04/06 23:05:58 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index 160f414b1e3f..d2c99ec79318 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.26 1998/06/01 13:00:32 peter Exp $
+# $FreeBSD$
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c shlib.c md.c support.c
 MAN1=	rtld.1
diff --git a/libexec/rtld-aout/dynamic.h b/libexec/rtld-aout/dynamic.h
index c1890db0b55e..00d449f03cb6 100644
--- a/libexec/rtld-aout/dynamic.h
+++ b/libexec/rtld-aout/dynamic.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: dynamic.h,v 1.3 1997/02/22 15:46:18 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef __DYNAMIC_H__
diff --git a/libexec/rtld-aout/i386/md-static-funcs.c b/libexec/rtld-aout/i386/md-static-funcs.c
index 758a4b231724..77c25c5c2f67 100644
--- a/libexec/rtld-aout/i386/md-static-funcs.c
+++ b/libexec/rtld-aout/i386/md-static-funcs.c
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * Called by ld.so when onanating.
  * This *must* be a static function, so it is not called through a jmpslot.
diff --git a/libexec/rtld-aout/i386/md.c b/libexec/rtld-aout/i386/md.c
index 8e945e8344f7..63b9d17d5af8 100644
--- a/libexec/rtld-aout/i386/md.c
+++ b/libexec/rtld-aout/i386/md.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/i386/md.h b/libexec/rtld-aout/i386/md.h
index 84785de7fa8d..ef5b632bbaee 100644
--- a/libexec/rtld-aout/i386/md.h
+++ b/libexec/rtld-aout/i386/md.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: md.h,v 1.16 1997/02/22 15:46:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef __MD_H__
diff --git a/libexec/rtld-aout/i386/mdprologue.S b/libexec/rtld-aout/i386/mdprologue.S
index 091fe7fdfce5..f111bcac6f95 100644
--- a/libexec/rtld-aout/i386/mdprologue.S
+++ b/libexec/rtld-aout/i386/mdprologue.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.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-aout/rtld.1 b/libexec/rtld-aout/rtld.1
index 90e9d546837c..52a1b32988f5 100644
--- a/libexec/rtld-aout/rtld.1
+++ b/libexec/rtld-aout/rtld.1
@@ -1,4 +1,4 @@
-.\"	$Id: rtld.1,v 1.14 1997/05/27 13:46:40 max Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
diff --git a/libexec/rtld-aout/rtld.1aout b/libexec/rtld-aout/rtld.1aout
index 90e9d546837c..52a1b32988f5 100644
--- a/libexec/rtld-aout/rtld.1aout
+++ b/libexec/rtld-aout/rtld.1aout
@@ -1,4 +1,4 @@
-.\"	$Id: rtld.1,v 1.14 1997/05/27 13:46:40 max Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c
index eff59b6a2a20..a55e9bc1199b 100644
--- a/libexec/rtld-aout/rtld.c
+++ b/libexec/rtld-aout/rtld.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rtld.c,v 1.56 1998/08/22 15:51:41 mckay Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index 5bd968f66cba..989cf45d8ab1 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.
  *
- *	$Id: shlib.c,v 1.20 1998/06/07 03:53:08 brian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.h b/libexec/rtld-aout/shlib.h
index e7d2211794e5..d05690fe144e 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.
  *-
- * $Id: shlib.h,v 1.3 1997/02/22 15:46:24 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-aout/support.c b/libexec/rtld-aout/support.c
index 0d9df2ab9312..71a84ffa1299 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.
  *-
- * $Id$
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <string.h>
diff --git a/libexec/rtld-aout/support.h b/libexec/rtld-aout/support.h
index 5be1e31c19d9..da0340783f27 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.
  *-
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 47598e6238d2..4b02d4b6aecd 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.6 1999/04/09 00:28:31 jdp Exp $
+# $FreeBSD$
 #
 MAINTAINER=	jdp
 PROG=		ld-elf.so.1
diff --git a/libexec/rtld-elf/alpha/reloc.c b/libexec/rtld-elf/alpha/reloc.c
index f77e952debe2..03d8c171183d 100644
--- a/libexec/rtld-elf/alpha/reloc.c
+++ b/libexec/rtld-elf/alpha/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.
  *
- *      $Id: reloc.c,v 1.5 1999/06/25 02:53:55 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/alpha/rtld_machdep.h b/libexec/rtld-elf/alpha/rtld_machdep.h
index bbbe83aac475..11927d63cc15 100644
--- a/libexec/rtld-elf/alpha/rtld_machdep.h
+++ b/libexec/rtld-elf/alpha/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rtld_machdep.h,v 1.1 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/alpha/rtld_start.S b/libexec/rtld-elf/alpha/rtld_start.S
index 8c665d65835f..d7ec0d341840 100644
--- a/libexec/rtld-elf/alpha/rtld_start.S
+++ b/libexec/rtld-elf/alpha/rtld_start.S
@@ -1,4 +1,4 @@
-/*	$Id: rtld_start.S,v 1.1 1998/09/04 19:03:57 dfr Exp $	*/
+/* $FreeBSD$	*/
 /*	From: NetBSD: rtld_start.S,v 1.1 1996/12/16 20:38:09 cgd Exp 	*/
 
 /*
diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c
index bdae9216a0f7..b4a2a75c63f2 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.
  *
- *      $Id: reloc.c,v 1.2 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/amd64/rtld_machdep.h
index fe39d43ed530..b44129ae53e8 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.
  *
- *	$Id: rtld_machdep.h,v 1.1 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/amd64/rtld_start.S b/libexec/rtld-elf/amd64/rtld_start.S
index d678f2ef8d68..76f1392625d7 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.
  *
- *      $Id: rtld_start.S,v 1.1.1.1 1998/03/07 19:24:35 jdp Exp $
+ * $FreeBSD$
  */
 
 	.text
diff --git a/libexec/rtld-elf/debug.c b/libexec/rtld-elf/debug.c
index dc31382b9a37..0c8ca35aedc1 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.
  *
- *      $Id: debug.c,v 1.1 1998/03/05 21:05:48 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h
index be11f5449089..8d57ec7930ab 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.
  *
- *      $Id: debug.h,v 1.1 1998/03/05 21:05:49 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
index bdae9216a0f7..b4a2a75c63f2 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.
  *
- *      $Id: reloc.c,v 1.2 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h
index fe39d43ed530..b44129ae53e8 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.
  *
- *	$Id: rtld_machdep.h,v 1.1 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/i386/rtld_start.S b/libexec/rtld-elf/i386/rtld_start.S
index d678f2ef8d68..76f1392625d7 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.
  *
- *      $Id: rtld_start.S,v 1.1.1.1 1998/03/07 19:24:35 jdp Exp $
+ * $FreeBSD$
  */
 
 	.text
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c
index 6689796b4888..8aefa41643f0 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 = "$Id: malloc.c,v 1.1.1.1 1998/03/07 19:24:35 jdp Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index 523a80bb85a3..0d4114fc6c25 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.
  *
- *      $Id: map_object.c,v 1.2 1998/09/04 19:03:57 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1
index 90e9d546837c..52a1b32988f5 100644
--- a/libexec/rtld-elf/rtld.1
+++ b/libexec/rtld-elf/rtld.1
@@ -1,4 +1,4 @@
-.\"	$Id: rtld.1,v 1.14 1997/05/27 13:46:40 max Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index f1dd6960227d..58cdbefcc690 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: rtld.c,v 1.29 1999/07/18 00:02:19 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index 95a057a33332..2fe8b1507d49 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.
  *
- *      $Id: rtld.h,v 1.6 1999/04/09 00:28:31 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef RTLD_H /* { */
diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c
index 18a073b5e2ea..d6da3340bfd0 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.
  *
- *      $Id: xmalloc.c,v 1.1 1998/03/05 21:05:54 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <err.h>
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index 1754066e11b3..100e867ba5be 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 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 cd4dc55d4c18..dccd8d887b32 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[] =
-	"$Id: announce.c,v 1.9 1997/12/02 12:33:11 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index fffdf9c4dd30..8c1ba9b5e0e1 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[] =
-	"$Id: print.c,v 1.7 1997/12/24 19:39:57 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* debug print routines */
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index 34c6a909f9e6..b3659a599afe 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[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index f1bcc22e3b3c..5062c78049d8 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[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index 72e4a5f50ac6..ca30ef725f13 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[] =
-	"$Id: talkd.c,v 1.9 1998/12/01 21:12:57 dillon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index eb25b14bad05..068087a62c65 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	telnetd
 CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS
diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h
index 05898fb5521d..bce0e2a71aef 100644
--- a/libexec/telnetd/ext.h
+++ b/libexec/telnetd/ext.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ext.h	8.2 (Berkeley) 12/15/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/telnetd/global.c b/libexec/telnetd/global.c
index 8e5c7bb055b5..cedff5770f81 100644
--- a/libexec/telnetd/global.c
+++ b/libexec/telnetd/global.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)global.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/telnetd/pathnames.h b/libexec/telnetd/pathnames.h
index 979f4d00a4f8..ed8ee887a39e 100644
--- a/libexec/telnetd/pathnames.h
+++ b/libexec/telnetd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #if BSD > 43
diff --git a/libexec/telnetd/slc.c b/libexec/telnetd/slc.c
index 9578e52629ce..f19f79fbeb5e 100644
--- a/libexec/telnetd/slc.c
+++ b/libexec/telnetd/slc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)slc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: slc.c,v 1.6 1997/12/03 07:15:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/state.c b/libexec/telnetd/state.c
index aeb64bbf7167..476a99219198 100644
--- a/libexec/telnetd/state.c
+++ b/libexec/telnetd/state.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)state.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index a1d0e662126d..d7e9ed394808 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sys_term.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id: sys_term.c,v 1.22 1999/08/09 02:19:38 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index f9f2d481605b..0d50eb630dcd 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.3 (Berkeley) 3/1/94
-.\"	$Id: telnetd.8,v 1.12 1998/05/04 02:37:29 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 1, 1994
 .Dt TELNETD 8
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 7472bd34cf2d..5141c2aecf42 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)telnetd.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id: telnetd.c,v 1.19 1999/04/07 08:39:54 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/termstat.c b/libexec/telnetd/termstat.c
index b95aa5fbf279..ee9034413223 100644
--- a/libexec/telnetd/termstat.c
+++ b/libexec/telnetd/termstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)termstat.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/utility.c b/libexec/telnetd/utility.c
index 036a3c934fd4..ee6917340820 100644
--- a/libexec/telnetd/utility.c
+++ b/libexec/telnetd/utility.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utility.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id: utility.c,v 1.11 1997/12/08 07:46:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifdef __FreeBSD__
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index 301a0d736ae6..ce43894dcb21 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.5 1997/02/22 14:22:35 peter Exp $
+# $FreeBSD$
 
 PROG=	tftpd
 SRCS=	tftpd.c tftpsubs.c
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 54cda4bd8e12..07475a45e852 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[] =
-	"$Id: tftpd.c,v 1.13 1999/04/06 23:05:59 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile
index 9a296c99cea1..3aeb623eab90 100644
--- a/libexec/uucpd/Makefile
+++ b/libexec/uucpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	uucpd
 MAN8=	uucpd.8
diff --git a/libexec/uucpd/pathnames.h b/libexec/uucpd/pathnames.h
index 782f23e87416..c06df3685d91 100644
--- a/libexec/uucpd/pathnames.h
+++ b/libexec/uucpd/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/libexec/uucpd/uucpd.8 b/libexec/uucpd/uucpd.8
index 3b964e3c5785..3566229a028d 100644
--- a/libexec/uucpd/uucpd.8
+++ b/libexec/uucpd/uucpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\"	$Id: uucpd.8,v 1.5 1997/02/22 14:22:39 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd Feb 18, 1996
 .Dt UUCPD 8
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index 9c422e93fc86..b1ac24da85f3 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uucpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: uucpd.c,v 1.18 1999/04/07 08:27:45 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile
index d89e07903ba7..3418457cc3f9 100644
--- a/libexec/xtend/Makefile
+++ b/libexec/xtend/Makefile
@@ -1,5 +1,5 @@
 # Makefile for xtend (Stark) 10/30/93
-# $Id$
+# $FreeBSD$
 
 BINMODE=	555
 
diff --git a/libexec/xtend/packet.c b/libexec/xtend/packet.c
index bdef357f198c..f3a4e04d90d1 100644
--- a/libexec/xtend/packet.c
+++ b/libexec/xtend/packet.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/xtend/paths.h b/libexec/xtend/paths.h
index e41d214ed07f..da1993efb015 100644
--- a/libexec/xtend/paths.h
+++ b/libexec/xtend/paths.h
@@ -1,7 +1,7 @@
 /*
  * Pathnames for files used by xtend
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define X10DIR		"/var/spool/xten"
diff --git a/libexec/xtend/status.c b/libexec/xtend/status.c
index ca85cdceee8f..538f30be707d 100644
--- a/libexec/xtend/status.c
+++ b/libexec/xtend/status.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/xtend/user.c b/libexec/xtend/user.c
index 6f898dfeb3be..f2c019010e10 100644
--- a/libexec/xtend/user.c
+++ b/libexec/xtend/user.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: user.c,v 1.7 1997/12/04 07:25:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/libexec/xtend/xten.h b/libexec/xtend/xten.h
index 23e8c6b266d0..f07bb2cc528b 100644
--- a/libexec/xtend/xten.h
+++ b/libexec/xtend/xten.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern char *X10housenames[];
diff --git a/libexec/xtend/xtend.8 b/libexec/xtend/xtend.8
index f970aa6aa793..d3593d2dbf71 100644
--- a/libexec/xtend/xtend.8
+++ b/libexec/xtend/xtend.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: xtend.8,v 1.9 1998/03/19 07:37:36 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Th XTEND 8 "30 Oct 1993"
 .Dd Oct 30, 1993
diff --git a/libexec/xtend/xtend.c b/libexec/xtend/xtend.c
index 01fcb68c018f..1f37deb475e9 100644
--- a/libexec/xtend/xtend.c
+++ b/libexec/xtend/xtend.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: xtend.c,v 1.7 1999/08/08 07:05:46 stark Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/xtend/xtend.h b/libexec/xtend/xtend.h
index 9d704449cf69..e338603d7d77 100644
--- a/libexec/xtend/xtend.h
+++ b/libexec/xtend/xtend.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index b43aa87e073f..f03b266d2480 100644
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1997/02/22 14:22:46 peter Exp $
+# $FreeBSD$
 
 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 c429c27f77e3..bd45c431da3f 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <db.h>
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index fdc3bb0f8f2f..6bdfd027f261 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.
 .\"
-.\"	$Id: ypxfr.8,v 1.7 1997/12/08 07:49:51 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 5, 1995
 .Dt YPXFR 8
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index 5ca370c874cb..34c3406ee526 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.
  *
- *	$Id$
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <limits.h>
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index bc2d936bf4c6..085d6319a685 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index 1f3076fa6281..a4ad1a0d56c6 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypxfr_main.c,v 1.12 1998/08/02 16:44:18 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index e135ae6bed9b..e31e9201873a 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index 1ac2df4bbf0c..72555a339c29 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/Makefile b/sbin/Makefile
index 596b22c2aca6..70f3b1d9bd16 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
-#	$Id: Makefile,v 1.68 1999/04/18 15:56:19 peter Exp $
+# $FreeBSD$
 
 # XXX MISSING:		icheck ncheck
 
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 9a440eb14bff..61a99c1a36aa 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.
 .\"
-.\"	$Id: adjkerntz.8,v 1.15 1998/04/11 21:18:53 ache Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 745868db86af..743782a66f5d 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -32,7 +32,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index 481f21645509..f17c173f261a 100644
--- a/sbin/atm/Makefile
+++ b/sbin/atm/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
+#	@(#) $FreeBSD$
 #
 
 SUBDIR=	atm \
diff --git a/sbin/atm/Makefile.inc b/sbin/atm/Makefile.inc
index 2bf6722808e6..8878187339ca 100644
--- a/sbin/atm/Makefile.inc
+++ b/sbin/atm/Makefile.inc
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $Id: Makefile.inc,v 1.5 1998/07/10 16:01:58 jpt Exp $
+#	@(#) $FreeBSD$
 #
 #
 
diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index 6d5667bb4c83..dab4b348ee8e 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/atm/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $Id: Makefile,v 1.2 1998/09/15 19:16:25 phk Exp $
+#	@(#) $FreeBSD$
 #
 #
 
diff --git a/sbin/atm/atm/atm.8 b/sbin/atm/atm/atm.8
index 9dc923178fb8..67764055e31e 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.
 .\"
-.\" @(#) $Id: atm.8,v 1.1 1998/09/15 08:22:45 phk Exp $
+.\" @(#) $FreeBSD$
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/atm/atm.c b/sbin/atm/atm/atm.c
index 923120729edf..77058a1d5f95 100644
--- a/sbin/atm/atm/atm.c
+++ b/sbin/atm/atm/atm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm.c,v 1.1 1998/09/15 08:22:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -60,7 +60,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm.c,v 1.1 1998/09/15 08:22:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h
index bed5bad06cba..62556806c62b 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.
  *
- *	@(#) $Id: atm.h,v 1.2 1999/01/20 18:36:58 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sbin/atm/atm/atm_eni.c b/sbin/atm/atm/atm_eni.c
index 6bf0985dc34c..b2c5deec3b0d 100644
--- a/sbin/atm/atm/atm_eni.c
+++ b/sbin/atm/atm/atm_eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_eni.c,v 1.1 1998/09/15 08:22:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -57,7 +57,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_eni.c,v 1.1 1998/09/15 08:22:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_fore200.c b/sbin/atm/atm/atm_fore200.c
index 0040aa4ecfba..f2522fdccd62 100644
--- a/sbin/atm/atm/atm_fore200.c
+++ b/sbin/atm/atm/atm_fore200.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_fore200.c,v 1.1 1998/09/15 08:22:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -59,7 +59,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_fore200.c,v 1.1 1998/09/15 08:22:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_inet.c b/sbin/atm/atm/atm_inet.c
index 9ca2ceb1494c..4c8bb169de81 100644
--- a/sbin/atm/atm/atm_inet.c
+++ b/sbin/atm/atm/atm_inet.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_inet.c,v 1.1 1998/09/15 08:22:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -56,7 +56,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_inet.c,v 1.1 1998/09/15 08:22:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_print.c b/sbin/atm/atm/atm_print.c
index 4b5e8432d22f..30bf2ec079e7 100644
--- a/sbin/atm/atm/atm_print.c
+++ b/sbin/atm/atm/atm_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_print.c,v 1.1 1998/09/15 08:22:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -64,7 +64,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_print.c,v 1.1 1998/09/15 08:22:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_set.c b/sbin/atm/atm/atm_set.c
index 413116b2965f..6522e830df4c 100644
--- a/sbin/atm/atm/atm_set.c
+++ b/sbin/atm/atm/atm_set.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_set.c,v 1.1 1998/09/15 08:22:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -58,7 +58,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_set.c,v 1.1 1998/09/15 08:22:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_show.c b/sbin/atm/atm/atm_show.c
index 7e296857db74..8ab7a22eca5c 100644
--- a/sbin/atm/atm/atm_show.c
+++ b/sbin/atm/atm/atm_show.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_show.c,v 1.1 1998/09/15 08:22:46 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -57,7 +57,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_show.c,v 1.1 1998/09/15 08:22:46 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/atm/atm_subr.c b/sbin/atm/atm/atm_subr.c
index 6c2cbb95e1f4..c923c28a6e51 100644
--- a/sbin/atm/atm/atm_subr.c
+++ b/sbin/atm/atm/atm_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_subr.c,v 1.1 1998/09/15 08:22:46 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -57,7 +57,7 @@
 #include "atm.h"
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_subr.c,v 1.1 1998/09/15 08:22:46 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index fef11f302c0b..8162a1d94a83 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $Id: Makefile,v 1.2 1998/09/15 19:16:32 phk Exp $
+#	@(#) $FreeBSD$
 #
 #
 
diff --git a/sbin/atm/fore_dnld/fore_dnld.8 b/sbin/atm/fore_dnld/fore_dnld.8
index 770f85dec133..b41a941e9867 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.
 .\"
-.\" @(#) $Id: fore_dnld.1,v 1.4 1997/05/09 17:29:37 mks Exp $
+.\" @(#) $FreeBSD$
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index ecf0567cebed..8b98cc1161db 100644
--- a/sbin/atm/fore_dnld/fore_dnld.c
+++ b/sbin/atm/fore_dnld/fore_dnld.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_dnld.c,v 1.3 1999/05/23 23:18:34 imp Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -64,7 +64,7 @@
 #include <unistd.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_dnld.c,v 1.3 1999/05/23 23:18:34 imp Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index 60828552e333..bdeb248fc397 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/Makefile
@@ -23,7 +23,7 @@
 # Copies of this Software may be made, however, the above copyright
 # notice must be reproduced on all copies.
 #
-#	@(#) $Id: Makefile,v 1.2 1998/09/15 19:16:32 phk Exp $
+#	@(#) $FreeBSD$
 #
 #
 
diff --git a/sbin/atm/ilmid/ilmid.8 b/sbin/atm/ilmid/ilmid.8
index e837adbba1a3..9ee295882ec4 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.
 .\"
-.\" @(#) $Id:$
+.\" @(#) $FreeBSD$
 .\"
 .\"
 .de EX		\"Begin example
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index 7c2e0f388053..4bb136c2d0e4 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *      @(#) $Id: ilmid.c,v 1.3 1999/05/23 23:18:38 imp Exp $
+ *      @(#) $FreeBSD$
  *
  */
 
@@ -73,7 +73,7 @@
 #include <unistd.h>
 
 #ifndef	lint
-__RCSID("@(#) $Id: ilmid.c,v 1.3 1999/05/23 23:18:38 imp Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 9dacbb4ccf82..6c80a970097f 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: badsect.8,v 1.6 1997/10/15 17:33:47 max Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index a5be4174ce48..7ecf1863735d 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)badsect.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id: badsect.c,v 1.5 1998/06/04 06:38:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
index 7698a6331071..44b6243e4b5c 100644
--- a/sbin/bsdlabel/bsdlabel.5
+++ b/sbin/bsdlabel/bsdlabel.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\"	$Id: disklabel.5,v 1.4 1998/06/04 06:49:12 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index edad511ec32e..4649a2e65b0d 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\"	$Id: disklabel.8,v 1.13 1999/08/15 08:06:08 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1999
 .Dt DISKLABEL 8
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index e084f3dc40fb..62a14751b43a 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #endif
 static const char rcsid[] =
-	"$Id: disklabel.c,v 1.24 1998/12/17 16:50:10 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/bsdlabel/dkcksum.c b/sbin/bsdlabel/dkcksum.c
index ae30b7b1dc75..3a58aa23044b 100644
--- a/sbin/bsdlabel/dkcksum.c
+++ b/sbin/bsdlabel/dkcksum.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dkcksum.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index c6be85669b09..346fef051b58 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.
 .\"
-.\"	$Id: camcontrol.8,v 1.14 1999/08/01 20:31:57 sada Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index db37df23cd42..687349a20269 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: camcontrol.c,v 1.11 1999/05/10 23:30:01 ken Exp $
+ * $FreeBSD$
  */
 
 #include <sys/ioctl.h>
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index e82183475c4c..4218576a56e6 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.
  *
- *	$Id: camcontrol.h,v 1.1 1998/09/15 06:43:02 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAMCONTROL_H
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 6df239256d03..811c42f62562 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -45,7 +45,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-	"$Id: modeedit.c,v 1.1 1998/09/15 06:43:02 gibbs Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 6df239256d03..811c42f62562 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -45,7 +45,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-	"$Id: modeedit.c,v 1.1 1998/09/15 06:43:02 gibbs Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 59ce4d085bde..e687ad1873d0 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ccdconfig.8,v 1.6 1998/11/19 20:22:10 asami Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 95318c9d8d35..4deaa3aae58b 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ccdconfig.c,v 1.12 1999/05/06 19:20:34 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 710e863abe87..7f66eccc54f2 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\"	$Id: clri.8,v 1.5 1997/02/22 14:32:11 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 28c2e74cc18f..85de80f4ee76 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index ffd41de8a3a2..4b12b6e0be0c 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\"	$Id: comcontrol.8,v 1.13 1998/03/19 07:46:39 charnier Exp $
+.\" $FreeBSD$
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c
index 372f984409e4..671551e07d60 100644
--- a/sbin/comcontrol/comcontrol.c
+++ b/sbin/comcontrol/comcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/cxconfig/cxconfig.8 b/sbin/cxconfig/cxconfig.8
index e502e38edfac..066c4e95e9a0 100644
--- a/sbin/cxconfig/cxconfig.8
+++ b/sbin/cxconfig/cxconfig.8
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\" $FreeBSD$
 .Dd December 2, 1994
 .Dt CXCONFIG 8
 .Os FreeBSD
diff --git a/sbin/cxconfig/cxconfig.c b/sbin/cxconfig/cxconfig.c
index cae322b702b7..3ae000d58f4b 100644
--- a/sbin/cxconfig/cxconfig.c
+++ b/sbin/cxconfig/cxconfig.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 66d961cf6798..40d2a5bef23d 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1999/04/03 07:09:59 bde Exp $
+# $FreeBSD$
 
 DIST_DIR= ${.CURDIR}/../../contrib/isc-dhcp
 
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 7698a6331071..44b6243e4b5c 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\"	$Id: disklabel.5,v 1.4 1998/06/04 06:49:12 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index edad511ec32e..4649a2e65b0d 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\"	$Id: disklabel.8,v 1.13 1999/08/15 08:06:08 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1999
 .Dt DISKLABEL 8
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index e084f3dc40fb..62a14751b43a 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #endif
 static const char rcsid[] =
-	"$Id: disklabel.c,v 1.24 1998/12/17 16:50:10 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/disklabel/dkcksum.c b/sbin/disklabel/dkcksum.c
index ae30b7b1dc75..3a58aa23044b 100644
--- a/sbin/disklabel/dkcksum.c
+++ b/sbin/disklabel/dkcksum.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dkcksum.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index af9da8328867..fd9e175c23a4 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dmesg.8	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt DMESG 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index a7bfe3fc68eb..6071680edd5a 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id: dmesg.c,v 1.9 1998/06/04 06:51:14 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/msgbuf.h>
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 8d12faa6d513..0452bfc49e1a 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.7 1998/08/06 21:40:13 markm Exp $
+# $FreeBSD$
 
 #	dump.h			header file
 #	itime.c			reads /etc/dumpdates
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index d0b517ea9653..79abc51072ad 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\"	$Id: dump.8,v 1.21 1998/06/15 06:58:09 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index caf6736fba0d..b6563e529dc9 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: dumprmt.c,v 1.12 1998/07/14 09:19:46 jkoshy Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 483533eb7f82..6209dab66feb 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index d7308afb68e9..30be0c9280ab 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.18 1998/09/16 20:52:12 andreas Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 6bea76a8cc6e..6a022d147892 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: optr.c,v 1.6 1999/03/21 23:47:38 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 485e631daec4..b25875fbea95 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tape.c	8.4 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: tape.c,v 1.10 1998/09/15 10:25:50 gibbs Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 310de34a950c..18eec042f232 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)traverse.c	8.7 (Berkeley) 6/15/95";
 #endif
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.8 1998/10/27 04:01:08 dima Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index 09557e5bf947..4e8e6697c931 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 7f52246b436f..8c668c13e9a6 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index aa617d5518f7..8e0416e74dea 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)dumpfs.c	8.5 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-	"$Id: dumpfs.c,v 1.11 1999/06/27 10:05:14 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index da6f36506679..bd41769b8d2b 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	dumpon
 MAN8=	dumpon.8
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 8559681f9730..61359f413fcf 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: dumpon.8,v 1.9 1998/08/31 16:41:06 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 547b6186b81d..76cdc60e768b 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 3e408ca6abb0..4a14439057c3 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: $
+# $FreeBSD$
 
 PROG=	fdisk
 MAN8=	fdisk.8
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index f5a44b06e7c3..9ddd557fa672 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\"	$Id: fdisk.8,v 1.14 1999/06/27 19:29:14 rnordier Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index d80a7ca4aee8..051bd61e08f4 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: fdisk.c,v 1.30 1999/08/23 11:06:19 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/fsck/dir.c b/sbin/fsck/dir.c
index 71e8a05b9139..f5fb6a0ef30a 100644
--- a/sbin/fsck/dir.c
+++ b/sbin/fsck/dir.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: dir.c,v 1.12 1998/09/23 05:37:35 nate Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 5ce5e0f681da..59d7fa8d1a47 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\"	$Id: fsck.8,v 1.11 1998/06/15 07:07:12 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 15, 1996
 .Dt FSCK 8
diff --git a/sbin/fsck/inode.c b/sbin/fsck/inode.c
index 5a8acd289752..98295be26ed4 100644
--- a/sbin/fsck/inode.c
+++ b/sbin/fsck/inode.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: inode.c,v 1.16 1998/08/01 18:03:28 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c
index bcf0021fd2a9..8d9afdbdbc49 100644
--- a/sbin/fsck/main.c
+++ b/sbin/fsck/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.15 1998/11/05 03:26:36 mjacob Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass1.c b/sbin/fsck/pass1.c
index 0d3fc478f37f..dd09b009705e 100644
--- a/sbin/fsck/pass1.c
+++ b/sbin/fsck/pass1.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass1.c,v 1.13 1998/07/06 19:11:35 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass1b.c b/sbin/fsck/pass1b.c
index 9380382a9198..7ef662f27364 100644
--- a/sbin/fsck/pass1b.c
+++ b/sbin/fsck/pass1b.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass1b.c,v 1.4 1998/06/15 07:07:17 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass2.c b/sbin/fsck/pass2.c
index 878bcbead4b7..088ecffb9817 100644
--- a/sbin/fsck/pass2.c
+++ b/sbin/fsck/pass2.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass2.c,v 1.7 1998/06/15 07:07:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass3.c b/sbin/fsck/pass3.c
index f91f2c1df1eb..80e38e9cbf4f 100644
--- a/sbin/fsck/pass3.c
+++ b/sbin/fsck/pass3.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass3.c,v 1.4 1998/06/15 07:07:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass4.c b/sbin/fsck/pass4.c
index 77b03ee0de81..0012c50adc7e 100644
--- a/sbin/fsck/pass4.c
+++ b/sbin/fsck/pass4.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass4.c,v 1.4 1998/06/15 07:07:19 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/pass5.c b/sbin/fsck/pass5.c
index d546e3fe3149..d5edaace1690 100644
--- a/sbin/fsck/pass5.c
+++ b/sbin/fsck/pass5.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass5.c,v 1.14 1998/08/15 10:07:33 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index ffae2c6de395..94baefa7d266 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: preen.c,v 1.11 1998/12/03 02:41:11 julian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck/setup.c b/sbin/fsck/setup.c
index 88a7b6b1e340..7444d37536c5 100644
--- a/sbin/fsck/setup.c
+++ b/sbin/fsck/setup.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #endif
 static const char rcsid[] =
-	"$Id: setup.c,v 1.12 1998/06/28 19:23:03 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #define DKTYPENAMES
diff --git a/sbin/fsck/utilities.c b/sbin/fsck/utilities.c
index b072964e8bf2..1efdabcd11d0 100644
--- a/sbin/fsck/utilities.c
+++ b/sbin/fsck/utilities.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif
 static const char rcsid[] =
-	"$Id: utilities.c,v 1.8 1998/06/15 07:07:21 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index 71e8a05b9139..f5fb6a0ef30a 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: dir.c,v 1.12 1998/09/23 05:37:35 nate Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 5ce5e0f681da..59d7fa8d1a47 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\"	$Id: fsck.8,v 1.11 1998/06/15 07:07:12 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 15, 1996
 .Dt FSCK 8
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 5a8acd289752..98295be26ed4 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: inode.c,v 1.16 1998/08/01 18:03:28 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index bcf0021fd2a9..8d9afdbdbc49 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.15 1998/11/05 03:26:36 mjacob Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 0d3fc478f37f..dd09b009705e 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass1.c,v 1.13 1998/07/06 19:11:35 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c
index 9380382a9198..7ef662f27364 100644
--- a/sbin/fsck_ffs/pass1b.c
+++ b/sbin/fsck_ffs/pass1b.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass1b.c,v 1.4 1998/06/15 07:07:17 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index 878bcbead4b7..088ecffb9817 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass2.c,v 1.7 1998/06/15 07:07:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c
index f91f2c1df1eb..80e38e9cbf4f 100644
--- a/sbin/fsck_ffs/pass3.c
+++ b/sbin/fsck_ffs/pass3.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass3.c,v 1.4 1998/06/15 07:07:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index 77b03ee0de81..0012c50adc7e 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass4.c,v 1.4 1998/06/15 07:07:19 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index d546e3fe3149..d5edaace1690 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass5.c,v 1.14 1998/08/15 10:07:33 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/preen.c b/sbin/fsck_ffs/preen.c
index ffae2c6de395..94baefa7d266 100644
--- a/sbin/fsck_ffs/preen.c
+++ b/sbin/fsck_ffs/preen.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: preen.c,v 1.11 1998/12/03 02:41:11 julian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 88a7b6b1e340..7444d37536c5 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #endif
 static const char rcsid[] =
-	"$Id: setup.c,v 1.12 1998/06/28 19:23:03 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #define DKTYPENAMES
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index b072964e8bf2..1efdabcd11d0 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif
 static const char rcsid[] =
-	"$Id: utilities.c,v 1.8 1998/06/15 07:07:21 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/dir.c b/sbin/fsck_ifs/dir.c
index 71e8a05b9139..f5fb6a0ef30a 100644
--- a/sbin/fsck_ifs/dir.c
+++ b/sbin/fsck_ifs/dir.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: dir.c,v 1.12 1998/09/23 05:37:35 nate Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/fsck_ifs.8 b/sbin/fsck_ifs/fsck_ifs.8
index 5ce5e0f681da..59d7fa8d1a47 100644
--- a/sbin/fsck_ifs/fsck_ifs.8
+++ b/sbin/fsck_ifs/fsck_ifs.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.4 (Berkeley) 5/9/95
-.\"	$Id: fsck.8,v 1.11 1998/06/15 07:07:12 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 15, 1996
 .Dt FSCK 8
diff --git a/sbin/fsck_ifs/inode.c b/sbin/fsck_ifs/inode.c
index 5a8acd289752..98295be26ed4 100644
--- a/sbin/fsck_ifs/inode.c
+++ b/sbin/fsck_ifs/inode.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: inode.c,v 1.16 1998/08/01 18:03:28 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/main.c b/sbin/fsck_ifs/main.c
index bcf0021fd2a9..8d9afdbdbc49 100644
--- a/sbin/fsck_ifs/main.c
+++ b/sbin/fsck_ifs/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.15 1998/11/05 03:26:36 mjacob Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/pass1.c b/sbin/fsck_ifs/pass1.c
index 0d3fc478f37f..dd09b009705e 100644
--- a/sbin/fsck_ifs/pass1.c
+++ b/sbin/fsck_ifs/pass1.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass1.c,v 1.13 1998/07/06 19:11:35 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/pass1b.c b/sbin/fsck_ifs/pass1b.c
index 9380382a9198..7ef662f27364 100644
--- a/sbin/fsck_ifs/pass1b.c
+++ b/sbin/fsck_ifs/pass1b.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass1b.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass1b.c,v 1.4 1998/06/15 07:07:17 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/pass2.c b/sbin/fsck_ifs/pass2.c
index 878bcbead4b7..088ecffb9817 100644
--- a/sbin/fsck_ifs/pass2.c
+++ b/sbin/fsck_ifs/pass2.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass2.c,v 1.7 1998/06/15 07:07:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/pass3.c b/sbin/fsck_ifs/pass3.c
index f91f2c1df1eb..80e38e9cbf4f 100644
--- a/sbin/fsck_ifs/pass3.c
+++ b/sbin/fsck_ifs/pass3.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass3.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass3.c,v 1.4 1998/06/15 07:07:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/pass4.c b/sbin/fsck_ifs/pass4.c
index 77b03ee0de81..0012c50adc7e 100644
--- a/sbin/fsck_ifs/pass4.c
+++ b/sbin/fsck_ifs/pass4.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass4.c,v 1.4 1998/06/15 07:07:19 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/pass5.c b/sbin/fsck_ifs/pass5.c
index d546e3fe3149..d5edaace1690 100644
--- a/sbin/fsck_ifs/pass5.c
+++ b/sbin/fsck_ifs/pass5.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pass5.c	8.9 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: pass5.c,v 1.14 1998/08/15 10:07:33 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/preen.c b/sbin/fsck_ifs/preen.c
index ffae2c6de395..94baefa7d266 100644
--- a/sbin/fsck_ifs/preen.c
+++ b/sbin/fsck_ifs/preen.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: preen.c,v 1.11 1998/12/03 02:41:11 julian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsck_ifs/setup.c b/sbin/fsck_ifs/setup.c
index 88a7b6b1e340..7444d37536c5 100644
--- a/sbin/fsck_ifs/setup.c
+++ b/sbin/fsck_ifs/setup.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #endif
 static const char rcsid[] =
-	"$Id: setup.c,v 1.12 1998/06/28 19:23:03 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #define DKTYPENAMES
diff --git a/sbin/fsck_ifs/utilities.c b/sbin/fsck_ifs/utilities.c
index b072964e8bf2..1efdabcd11d0 100644
--- a/sbin/fsck_ifs/utilities.c
+++ b/sbin/fsck_ifs/utilities.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #endif
 static const char rcsid[] =
-	"$Id: utilities.c,v 1.8 1998/06/15 07:07:21 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index e83e50c2db84..ef842c9d50b2 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
-#	$Id: Makefile,v 1.7 1998/02/05 14:31:05 jhay Exp $
+# $FreeBSD$
 
 PROG=	fsdb
 MAN8=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index b3ebc0b6a166..147f7e084c20 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.
 .\"
-.\"	$Id: fsdb.8,v 1.8 1998/06/15 07:12:18 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 007b76230881..7076f585443b 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: fsdb.c,v 1.11 1998/11/09 03:43:55 truckman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
index b7c30576d9b6..a7fd5c41d31d 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.
  *
- * $Id: fsdb.h,v 1.2 1997/03/13 12:44:52 peter Exp $
+ * $FreeBSD$
  */
 
 extern int bread __P((int fd, char *buf, daddr_t blk, long size));
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index d6a3684629da..3a6205063664 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: fsdbutil.c,v 1.7 1998/06/15 07:12:20 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 1f37d2d36d5a..84caddc93b4e 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 $
-.\" $Id: fsirand.8,v 1.7 1998/03/19 07:45:04 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index ffa2d74b6b43..918424faa57b 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/i386/Makefile b/sbin/i386/Makefile
index 76462f52b1ad..7a907448fb72 100644
--- a/sbin/i386/Makefile
+++ b/sbin/i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1997/02/22 14:32:26 peter Exp $
+# $FreeBSD$
 
 SUBDIR=	comcontrol \
 	fdisk \
diff --git a/sbin/i386/Makefile.inc b/sbin/i386/Makefile.inc
index c961f8568307..b915adff92ab 100644
--- a/sbin/i386/Makefile.inc
+++ b/sbin/i386/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/sbin/i386/comcontrol/comcontrol.8 b/sbin/i386/comcontrol/comcontrol.8
index ffd41de8a3a2..4b12b6e0be0c 100644
--- a/sbin/i386/comcontrol/comcontrol.8
+++ b/sbin/i386/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\"	$Id: comcontrol.8,v 1.13 1998/03/19 07:46:39 charnier Exp $
+.\" $FreeBSD$
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/i386/comcontrol/comcontrol.c b/sbin/i386/comcontrol/comcontrol.c
index 372f984409e4..671551e07d60 100644
--- a/sbin/i386/comcontrol/comcontrol.c
+++ b/sbin/i386/comcontrol/comcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8
index e502e38edfac..066c4e95e9a0 100644
--- a/sbin/i386/cxconfig/cxconfig.8
+++ b/sbin/i386/cxconfig/cxconfig.8
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\" $FreeBSD$
 .Dd December 2, 1994
 .Dt CXCONFIG 8
 .Os FreeBSD
diff --git a/sbin/i386/cxconfig/cxconfig.c b/sbin/i386/cxconfig/cxconfig.c
index cae322b702b7..3ae000d58f4b 100644
--- a/sbin/i386/cxconfig/cxconfig.c
+++ b/sbin/i386/cxconfig/cxconfig.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/i386/fdisk/Makefile b/sbin/i386/fdisk/Makefile
index 3e408ca6abb0..4a14439057c3 100644
--- a/sbin/i386/fdisk/Makefile
+++ b/sbin/i386/fdisk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: $
+# $FreeBSD$
 
 PROG=	fdisk
 MAN8=	fdisk.8
diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8
index f5a44b06e7c3..9ddd557fa672 100644
--- a/sbin/i386/fdisk/fdisk.8
+++ b/sbin/i386/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\"	$Id: fdisk.8,v 1.14 1999/06/27 19:29:14 rnordier Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 4, 1996
 .Dt FDISK 8
diff --git a/sbin/i386/fdisk/fdisk.c b/sbin/i386/fdisk/fdisk.c
index d80a7ca4aee8..051bd61e08f4 100644
--- a/sbin/i386/fdisk/fdisk.c
+++ b/sbin/i386/fdisk/fdisk.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: fdisk.c,v 1.30 1999/08/23 11:06:19 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/i386/ft/Makefile b/sbin/i386/ft/Makefile
index 3fb1b7440e52..16c7bf86af77 100644
--- a/sbin/i386/ft/Makefile
+++ b/sbin/i386/ft/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ft
 MAN8=	ft.8
diff --git a/sbin/i386/ft/ft.8 b/sbin/i386/ft/ft.8
index 986bb9267e18..6b709a054eff 100644
--- a/sbin/i386/ft/ft.8
+++ b/sbin/i386/ft/ft.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ft.8
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd February 7, 1994
 .Dt FT 8
diff --git a/sbin/i386/ft/ft.c b/sbin/i386/ft/ft.c
index 41591a4239f9..f4d3f7df5f5d 100644
--- a/sbin/i386/ft/ft.c
+++ b/sbin/i386/ft/ft.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/i386/ft/ftecc.c b/sbin/i386/ft/ftecc.c
index abc6d438d767..6946d53772bf 100644
--- a/sbin/i386/ft/ftecc.c
+++ b/sbin/i386/ft/ftecc.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/ftape.h>
diff --git a/sbin/i386/mount_msdos/Makefile b/sbin/i386/mount_msdos/Makefile
index d172a07f9cb6..700aaef1ba6b 100644
--- a/sbin/i386/mount_msdos/Makefile
+++ b/sbin/i386/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.9 1998/02/23 09:10:56 ache Exp $
+# $FreeBSD$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8
index 60a489e2941a..e3922c206e59 100644
--- a/sbin/i386/mount_msdos/mount_msdos.8
+++ b/sbin/i386/mount_msdos/mount_msdos.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.
 .\"
-.\"	$Id: mount_msdos.8,v 1.15 1999/01/11 18:35:14 dt Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/i386/mount_msdos/mount_msdos.c b/sbin/i386/mount_msdos/mount_msdos.c
index a9e545480a5f..dfb15df9a23e 100644
--- a/sbin/i386/mount_msdos/mount_msdos.c
+++ b/sbin/i386/mount_msdos/mount_msdos.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_msdos.c,v 1.15 1998/06/30 06:23:42 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index 6219087d3f2d..75ad6d3c74cd 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: nextboot.8,v 1.8 1998/06/30 06:28:17 charnier Exp $
+.\" $FreeBSD$
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/i386/nextboot/nextboot.c b/sbin/i386/nextboot/nextboot.c
index b74c4297868c..5893ca38a8a8 100644
--- a/sbin/i386/nextboot/nextboot.c
+++ b/sbin/i386/nextboot/nextboot.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index ae1760fbe66d..b1fe95b06e84 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.10 1997/05/04 06:27:45 peter Exp $
+# $FreeBSD$
 
 PROG=	ifconfig
 SRCS=	ifconfig.c
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index b797e1f7c530..cbe9d5107a47 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\"	$Id: ifconfig.8,v 1.18 1998/07/06 06:53:42 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 13, 1996
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 9252396f02c2..f2ece8fe9e11 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: ifconfig.c,v 1.41 1999/06/19 18:42:19 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index e2df8f51fedd..88b9503e7cb2 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -31,7 +31,7 @@
  *
  * so there!
  *
- * $Id: ifconfig.h,v 1.3 1997/05/10 17:14:53 peter Exp $
+ * $FreeBSD$
  */
 
 extern struct ifreq ifr;
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index 73e83de64c87..3ab28f87c79c 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 $	*/
-/*	$Id: ifmedia.c,v 1.4 1997/10/16 03:55:29 peter Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index 27014e4758dc..3843821781c3 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 static int			__tag = 0;
 static int			__have_tag = 0;
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 999a30723bae..645736dd2dc8 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.17 1999/07/01 13:33:56 ru Exp $
+# $FreeBSD$
 
 PROG=	init
 MAN8=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 7301085a22d3..e7aa9acd7f44 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\"	$Id: init.8,v 1.16 1999/07/01 13:33:56 ru Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index dc90e6d8bfcb..0e870939f15b 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 7/15/93";
 #endif
 static const char rcsid[] =
-	"$Id: init.c,v 1.33 1999/06/18 09:08:09 ru Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 6d9005badb43..d8f9fc764d64 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.\" $Id: ipfw.8,v 1.56 1999/08/11 15:36:13 luigi Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 20, 1996
 .Dt IPFW 8
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index 611ffa1d66e1..d297119f7bf8 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -20,7 +20,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ipfw.c,v 1.73 1999/08/11 15:36:13 luigi Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 
diff --git a/sbin/kget/Makefile b/sbin/kget/Makefile
index cc8774f939b9..d4bce5dbca70 100644
--- a/sbin/kget/Makefile
+++ b/sbin/kget/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/02/27 02:24:18 jkh Exp $
+# $FreeBSD$
 #
 PROG=	kget
 CFLAGS+= -I${.CURDIR}/../../sys/i386
diff --git a/sbin/kget/kget.8 b/sbin/kget/kget.8
index b3619c047b30..7fea15fd9cc7 100644
--- a/sbin/kget/kget.8
+++ b/sbin/kget/kget.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: kget.8,v 1.1 1999/02/27 02:24:18 jkh Exp $
+.\" $FreeBSD$
 .\"
 .Dd Feb 20, 1999
 .Dt KGET 8
diff --git a/sbin/kget/kget.c b/sbin/kget/kget.c
index 5b9f4c798123..24e1cb26cf3d 100644
--- a/sbin/kget/kget.c
+++ b/sbin/kget/kget.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kget.c,v 1.1 1999/02/27 02:24:18 jkh Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index 4b74f69e8ffa..6b044f52630d 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.
 #
-#	$Id: Makefile,v 1.2 1997/10/19 11:15:41 jmg Exp $
+# $FreeBSD$
 #
 
 PROG=	kldload
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 64d10cb32441..59d68052d9a6 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.
 .\"
-.\"	$Id: kldload.8,v 1.4 1998/03/19 07:45:17 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 25, 1997
 .Dt KLDLOAD 8
diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c
index e42785f24ed5..875c7aaa808b 100644
--- a/sbin/kldload/kldload.c
+++ b/sbin/kldload/kldload.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: kldload.c,v 1.4 1998/01/05 07:07:44 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index 5720690a649b..64d7c1247cba 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.
 #
-#	$Id: Makefile,v 1.2 1997/10/19 11:15:43 jmg Exp $
+# $FreeBSD$
 #
 
 PROG=	kldstat
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index 943f5446c61b..c540d331eb9e 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.
 .\"
-.\"	$Id: kldstat.8,v 1.4 1998/03/19 07:45:28 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 25, 1997
 .Dt KLDSTAT 8
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 8df5cece0d51..945f442df15a 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: kldstat.c,v 1.4 1998/01/05 07:09:28 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 2d541ff28460..b87d87275a03 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.
 #
-#	$Id: Makefile,v 1.2 1997/10/19 11:15:45 jmg Exp $
+# $FreeBSD$
 #
 
 PROG=	kldunload
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index 8fd216d33090..b2a1c60b66fc 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.
 .\"
-.\"	$Id: kldunload.8,v 1.5 1998/11/07 00:42:52 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 25, 1997
 .Dt KLDUNLOAD 8
diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c
index da139e703758..912f0fe70302 100644
--- a/sbin/kldunload/kldunload.c
+++ b/sbin/kldunload/kldunload.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: kldunload.c,v 1.7 1998/11/07 00:42:52 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index f902e92bb1c1..0b9792fab953 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13 1998/06/12 10:43:18 peter Exp $
+# $FreeBSD$
 
 PROG=	ldconfig
 SRCS=	elfhints.c ldconfig.c shlib.c support.c
diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c
index f61d8494fbc3..18186d6499de 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 9c4fd95e60de..c6c867b3303d 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.
 .\"
-.\"	$Id: ldconfig.8,v 1.15 1998/01/01 02:31:47 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 841fa30c3a95..01bbe1f5d596 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ldconfig.c,v 1.28 1998/09/09 01:21:24 jdp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ldconfig/ldconfig.h b/sbin/ldconfig/ldconfig.h
index 54c0d8687787..1ea712c8eb44 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef LDCONFIG_H
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index e681272822ee..bd1fd6d12261 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -19,7 +19,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: md5.c,v 1.14 1999/05/01 14:54:21 kris Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 0c6d5c605e96..8994d091bb98 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt MKNOD 8
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 5aeee4692b35..5bf4623c5585 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id: mknod.c,v 1.8 1998/07/06 07:06:15 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index f4e95245514f..96c996db24fe 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95
-#	$Id: Makefile,v 1.7 1998/03/08 14:50:00 msmith Exp $
+# $FreeBSD$
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
diff --git a/sbin/mount/extern.h b/sbin/mount/extern.h
index 71dde6c9c426..bc11a037ecfd 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.
  *
- *     $Id: extern.h,v 1.1 1997/08/24 21:28:38 steve Exp $
+ * $FreeBSD$
  */
 
 /* vfslist.c */
diff --git a/sbin/mount/getmntopts.3 b/sbin/mount/getmntopts.3
index cc4381b9ae74..84ad24f598a7 100644
--- a/sbin/mount/getmntopts.3
+++ b/sbin/mount/getmntopts.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getmntopts.3	8.3 (Berkeley) 3/30/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 30, 1995
 .Dt GETMNTOPTS 3
diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 25b8d090c128..c80c26281fb6 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
 #else
 static const char rcsid[] =
-	"$Id: getmntopts.c,v 1.6 1997/08/24 21:02:47 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 1be391d585c4..dd98298dba62 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
- *	$Id: mntopts.h,v 1.13 1998/04/08 18:31:17 wosch Exp $
+ * $FreeBSD$
  */
 
 struct mntopt {
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 9f729c0067a7..e882f88a7bca 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\"	$Id: mount.8,v 1.26 1999/05/07 05:22:07 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 96be4452272c..0cfe7421bccc 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-	"$Id: mount.c,v 1.30 1999/05/07 05:22:08 jkoshy Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index c6abfee22b70..3c0b6fcb711f 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id: mount_ufs.c,v 1.14 1998/07/06 07:12:38 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c
index 871de264f76a..d8201882eb33 100644
--- a/sbin/mount/vfslist.c
+++ b/sbin/mount/vfslist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vfslist.c	8.1 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index beeb37590c7a..387c687001a9 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
-.\"     $Id: mount_cd9660.8,v 1.9 1999/07/12 20:04:58 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_CD9660 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 220bf5aba381..a3185d7f9f3c 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -49,7 +49,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95";
 */
 static const char rcsid[] =
-	"$Id: mount_cd9660.c,v 1.12 1997/04/29 15:56:40 joerg Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 9441c8bcd2e0..3360b90d91f5 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .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 1d0ab5d531aa..00a20246f499 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_ext2fs.c,v 1.8 1997/03/29 03:32:36 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ifs/Makefile b/sbin/mount_ifs/Makefile
index f4e95245514f..96c996db24fe 100644
--- a/sbin/mount_ifs/Makefile
+++ b/sbin/mount_ifs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.6 (Berkeley) 5/8/95
-#	$Id: Makefile,v 1.7 1998/03/08 14:50:00 msmith Exp $
+# $FreeBSD$
 
 PROG=	mount
 SRCS=	mount.c mount_ufs.c getmntopts.c vfslist.c
diff --git a/sbin/mount_ifs/extern.h b/sbin/mount_ifs/extern.h
index 71dde6c9c426..bc11a037ecfd 100644
--- a/sbin/mount_ifs/extern.h
+++ b/sbin/mount_ifs/extern.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $Id: extern.h,v 1.1 1997/08/24 21:28:38 steve Exp $
+ * $FreeBSD$
  */
 
 /* vfslist.c */
diff --git a/sbin/mount_ifs/getmntopts.3 b/sbin/mount_ifs/getmntopts.3
index cc4381b9ae74..84ad24f598a7 100644
--- a/sbin/mount_ifs/getmntopts.3
+++ b/sbin/mount_ifs/getmntopts.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getmntopts.3	8.3 (Berkeley) 3/30/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 30, 1995
 .Dt GETMNTOPTS 3
diff --git a/sbin/mount_ifs/getmntopts.c b/sbin/mount_ifs/getmntopts.c
index 25b8d090c128..c80c26281fb6 100644
--- a/sbin/mount_ifs/getmntopts.c
+++ b/sbin/mount_ifs/getmntopts.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)getmntopts.c	8.3 (Berkeley) 3/29/95";
 #else
 static const char rcsid[] =
-	"$Id: getmntopts.c,v 1.6 1997/08/24 21:02:47 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/mount_ifs/mntopts.h b/sbin/mount_ifs/mntopts.h
index 1be391d585c4..dd98298dba62 100644
--- a/sbin/mount_ifs/mntopts.h
+++ b/sbin/mount_ifs/mntopts.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mntopts.h	8.7 (Berkeley) 3/29/95
- *	$Id: mntopts.h,v 1.13 1998/04/08 18:31:17 wosch Exp $
+ * $FreeBSD$
  */
 
 struct mntopt {
diff --git a/sbin/mount_ifs/mount.8 b/sbin/mount_ifs/mount.8
index 9f729c0067a7..e882f88a7bca 100644
--- a/sbin/mount_ifs/mount.8
+++ b/sbin/mount_ifs/mount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\"	$Id: mount.8,v 1.26 1999/05/07 05:22:07 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount_ifs/mount.c b/sbin/mount_ifs/mount.c
index 96be4452272c..0cfe7421bccc 100644
--- a/sbin/mount_ifs/mount.c
+++ b/sbin/mount_ifs/mount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-	"$Id: mount.c,v 1.30 1999/05/07 05:22:08 jkoshy Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ifs/mount_ufs.c b/sbin/mount_ifs/mount_ufs.c
index c6abfee22b70..3c0b6fcb711f 100644
--- a/sbin/mount_ifs/mount_ufs.c
+++ b/sbin/mount_ifs/mount_ufs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_ufs.c	8.4 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id: mount_ufs.c,v 1.14 1998/07/06 07:12:38 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ifs/vfslist.c b/sbin/mount_ifs/vfslist.c
index 871de264f76a..d8201882eb33 100644
--- a/sbin/mount_ifs/vfslist.c
+++ b/sbin/mount_ifs/vfslist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vfslist.c	8.1 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/mount_msdos/Makefile b/sbin/mount_msdos/Makefile
index d172a07f9cb6..700aaef1ba6b 100644
--- a/sbin/mount_msdos/Makefile
+++ b/sbin/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.9 1998/02/23 09:10:56 ache Exp $
+# $FreeBSD$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index 60a489e2941a..e3922c206e59 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.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.
 .\"
-.\"	$Id: mount_msdos.8,v 1.15 1999/01/11 18:35:14 dt Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index a9e545480a5f..dfb15df9a23e 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_msdos.c,v 1.15 1998/06/30 06:23:42 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index d172a07f9cb6..700aaef1ba6b 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.9 1998/02/23 09:10:56 ache Exp $
+# $FreeBSD$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 60a489e2941a..e3922c206e59 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.
 .\"
-.\"	$Id: mount_msdos.8,v 1.15 1999/01/11 18:35:14 dt Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index a9e545480a5f..dfb15df9a23e 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[] =
-	"$Id: mount_msdos.c,v 1.15 1998/06/30 06:23:42 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 92568d7af35f..262de65a6863 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\"
-.\" $Id: mount_nfs.8,v 1.13 1998/06/29 06:58:46 jkoshy Exp $
+.\" $FreeBSD$
 .\""
 .Dd March 29, 1995
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index c3fdb302067a..c382deb57410 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_nfs.c	8.11 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index ba8005b20c07..6a42178b7518 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.2 1999/01/30 05:06:53 semen Exp $
+# $FreeBSD$
 #
 
 PROG=	mount_ntfs
diff --git a/sbin/mount_ntfs/mount_ntfs.8 b/sbin/mount_ntfs/mount_ntfs.8
index 533f7854fa5e..dbb487221451 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.
 .\"
-.\"	$Id: mount_ntfs.8,v 1.3 1999/05/04 11:34:33 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd Jan 3, 1999
 .Dt MOUNT_NTFS 8
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 43ed49f97ff7..add62a1dd1d3 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.
  *
- * $Id: mount_ntfs.c,v 1.2 1999/02/02 01:47:22 semen Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index 16635371ec2f..83e279c307ef 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\"	$Id: mount_null.8,v 1.9 1998/07/06 07:17:26 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_NULL 8
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index c58e06d89791..a866e385f9fa 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 16635371ec2f..83e279c307ef 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.6 (Berkeley) 5/1/95
-.\"	$Id: mount_null.8,v 1.9 1998/07/06 07:17:26 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_NULL 8
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index c58e06d89791..a866e385f9fa 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 7734df49eee6..23a5bd771be8 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$Id: Makefile,v 1.8 1998/01/20 10:40:04 bde Exp $
+# $FreeBSD$
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/sbin/mount_portal/activate.c b/sbin/mount_portal/activate.c
index 6eb0c582753a..56464981471c 100644
--- a/sbin/mount_portal/activate.c
+++ b/sbin/mount_portal/activate.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: activate.c,v 1.5 1998/07/06 07:19:23 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c
index 373e62d6fb47..d5833e4b2136 100644
--- a/sbin/mount_portal/conf.c
+++ b/sbin/mount_portal/conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: conf.c,v 1.6 1998/07/06 07:19:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/mount_portal.8 b/sbin/mount_portal/mount_portal.8
index 68183392eb3b..afaa3d7175f5 100644
--- a/sbin/mount_portal/mount_portal.8
+++ b/sbin/mount_portal/mount_portal.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\"	$Id: mount_portal.8,v 1.5 1999/08/06 04:19:27 dwhite Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index 6de71ea947e7..c0b1852a44b3 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id: mount_portal.c,v 1.13 1998/07/06 07:19:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/pathnames.h b/sbin/mount_portal/pathnames.h
index 3203b00c1483..6b557704e38f 100644
--- a/sbin/mount_portal/pathnames.h
+++ b/sbin/mount_portal/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portal/portal.conf b/sbin/mount_portal/portal.conf
index 3a4ddf0a1a9b..53a07a92231c 100644
--- a/sbin/mount_portal/portal.conf
+++ b/sbin/mount_portal/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $Id$
+# $FreeBSD$
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index f01e8a88ca78..4131834c5575 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $Id: portald.h,v 1.3 1997/02/22 14:32:55 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portal/pt_conf.c b/sbin/mount_portal/pt_conf.c
index 11088ea2934d..f158a73dd03d 100644
--- a/sbin/mount_portal/pt_conf.c
+++ b/sbin/mount_portal/pt_conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: pt_conf.c,v 1.4 1998/07/06 07:19:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portal/pt_exec.c b/sbin/mount_portal/pt_exec.c
index 6ee326d50a00..359c78e92164 100644
--- a/sbin/mount_portal/pt_exec.c
+++ b/sbin/mount_portal/pt_exec.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c
index 32207f31931e..f22ebd7d2b51 100644
--- a/sbin/mount_portal/pt_file.c
+++ b/sbin/mount_portal/pt_file.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portal/pt_tcp.c b/sbin/mount_portal/pt_tcp.c
index 954388ee03fd..49056163aae3 100644
--- a/sbin/mount_portal/pt_tcp.c
+++ b/sbin/mount_portal/pt_tcp.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: pt_tcp.c,v 1.7 1998/07/06 07:19:27 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portalfs/Makefile b/sbin/mount_portalfs/Makefile
index 7734df49eee6..23a5bd771be8 100644
--- a/sbin/mount_portalfs/Makefile
+++ b/sbin/mount_portalfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$Id: Makefile,v 1.8 1998/01/20 10:40:04 bde Exp $
+# $FreeBSD$
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/sbin/mount_portalfs/activate.c b/sbin/mount_portalfs/activate.c
index 6eb0c582753a..56464981471c 100644
--- a/sbin/mount_portalfs/activate.c
+++ b/sbin/mount_portalfs/activate.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: activate.c,v 1.5 1998/07/06 07:19:23 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portalfs/conf.c b/sbin/mount_portalfs/conf.c
index 373e62d6fb47..d5833e4b2136 100644
--- a/sbin/mount_portalfs/conf.c
+++ b/sbin/mount_portalfs/conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: conf.c,v 1.6 1998/07/06 07:19:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portalfs/mount_portalfs.8 b/sbin/mount_portalfs/mount_portalfs.8
index 68183392eb3b..afaa3d7175f5 100644
--- a/sbin/mount_portalfs/mount_portalfs.8
+++ b/sbin/mount_portalfs/mount_portalfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\"	$Id: mount_portal.8,v 1.5 1999/08/06 04:19:27 dwhite Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
diff --git a/sbin/mount_portalfs/mount_portalfs.c b/sbin/mount_portalfs/mount_portalfs.c
index 6de71ea947e7..c0b1852a44b3 100644
--- a/sbin/mount_portalfs/mount_portalfs.c
+++ b/sbin/mount_portalfs/mount_portalfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id: mount_portal.c,v 1.13 1998/07/06 07:19:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portalfs/pathnames.h b/sbin/mount_portalfs/pathnames.h
index 3203b00c1483..6b557704e38f 100644
--- a/sbin/mount_portalfs/pathnames.h
+++ b/sbin/mount_portalfs/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portalfs/portal.conf b/sbin/mount_portalfs/portal.conf
index 3a4ddf0a1a9b..53a07a92231c 100644
--- a/sbin/mount_portalfs/portal.conf
+++ b/sbin/mount_portalfs/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $Id$
+# $FreeBSD$
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portalfs/portald.h b/sbin/mount_portalfs/portald.h
index f01e8a88ca78..4131834c5575 100644
--- a/sbin/mount_portalfs/portald.h
+++ b/sbin/mount_portalfs/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $Id: portald.h,v 1.3 1997/02/22 14:32:55 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portalfs/pt_conf.c b/sbin/mount_portalfs/pt_conf.c
index 11088ea2934d..f158a73dd03d 100644
--- a/sbin/mount_portalfs/pt_conf.c
+++ b/sbin/mount_portalfs/pt_conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: pt_conf.c,v 1.4 1998/07/06 07:19:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portalfs/pt_exec.c b/sbin/mount_portalfs/pt_exec.c
index 6ee326d50a00..359c78e92164 100644
--- a/sbin/mount_portalfs/pt_exec.c
+++ b/sbin/mount_portalfs/pt_exec.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portalfs/pt_file.c b/sbin/mount_portalfs/pt_file.c
index 32207f31931e..f22ebd7d2b51 100644
--- a/sbin/mount_portalfs/pt_file.c
+++ b/sbin/mount_portalfs/pt_file.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_portalfs/pt_tcp.c b/sbin/mount_portalfs/pt_tcp.c
index 954388ee03fd..49056163aae3 100644
--- a/sbin/mount_portalfs/pt_tcp.c
+++ b/sbin/mount_portalfs/pt_tcp.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: pt_tcp.c,v 1.7 1998/07/06 07:19:27 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index a495ba3960f9..df019ce2853e 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: mount_std.8,v 1.7 1997/02/22 14:32:59 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index f9ae7d6f24bb..2d2c5a2670f3 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_std.c,v 1.7 1997/03/29 03:32:46 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index 1407305aed31..4c6abfa3e438 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_umap.8	8.4 (Berkeley) 5/1/95
-.\"	$Id: mount_umap.8,v 1.8 1998/07/15 06:12:31 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_UMAP 8
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index f3e439f16f19..888682c3b98e 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.5 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umapfs/mount_umapfs.8 b/sbin/mount_umapfs/mount_umapfs.8
index 1407305aed31..4c6abfa3e438 100644
--- a/sbin/mount_umapfs/mount_umapfs.8
+++ b/sbin/mount_umapfs/mount_umapfs.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_umap.8	8.4 (Berkeley) 5/1/95
-.\"	$Id: mount_umap.8,v 1.8 1998/07/15 06:12:31 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt MOUNT_UMAP 8
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index f3e439f16f19..888682c3b98e 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.5 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8
index eada8bf8c3f6..08a48044cdce 100644
--- a/sbin/mount_union/mount_union.8
+++ b/sbin/mount_union/mount_union.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\"	$Id: mount_union.8,v 1.4 1998/07/15 06:13:45 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_UNION 8
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index 07ba69253b2d..4222ede4baad 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index eada8bf8c3f6..08a48044cdce 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_union.8	8.6 (Berkeley) 3/27/94
-.\"	$Id: mount_union.8,v 1.4 1998/07/15 06:13:45 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_UNION 8
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index 07ba69253b2d..4222ede4baad 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount_union.c	8.5 (Berkeley) 3/27/94";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index 6a2097a91afe..0312e9b657e2 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-#	$Id: Makefile,v 1.7 1997/03/11 12:43:42 peter Exp $
+# $FreeBSD$
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 9239440f3def..9a148dea0304 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
-.\"	$Id: exports.5,v 1.7 1998/07/15 06:21:37 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index 43a4cd3e38da..98397f5a33f0 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\"	$Id: mountd.8,v 1.14 1998/10/15 13:37:35 mckay Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt MOUNTD 8
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 170655b01caf..cc5e572d137c 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mountd.c	8.15 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: mountd.c,v 1.34 1998/12/29 09:38:49 dfr Exp $";
+  "$FreeBSD$";
 #endif /*not lint*/
 
 #include <sys/param.h>
diff --git a/sbin/mountd/netgroup.5 b/sbin/mountd/netgroup.5
index f57aa2914941..8e2bf44265e6 100644
--- a/sbin/mountd/netgroup.5
+++ b/sbin/mountd/netgroup.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netgroup.5	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt NETGROUP 5
diff --git a/sbin/natd/icmp.c b/sbin/natd/icmp.c
index 1a144c2f3a4b..176addeee02d 100644
--- a/sbin/natd/icmp.c
+++ b/sbin/natd/icmp.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index dc33f3e9972f..24ebce5efe34 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\"	$Id: natd.8,v 1.20 1999/07/28 08:38:26 ru Exp $
+.\" $FreeBSD$
 .Dd 15 April 1997
 .Os FreeBSD
 .Dt NATD 8
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index aefcc7ea324d..4fedc0519521 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- *	$Id: natd.c,v 1.17 1999/05/13 17:09:44 brian Exp $
+ * $FreeBSD$
  */
 
 #define SYSLOG_NAMES
diff --git a/sbin/natd/natd.h b/sbin/natd/natd.h
index a23e38a3960c..ac0dd75de50d 100644
--- a/sbin/natd/natd.h
+++ b/sbin/natd/natd.h
@@ -9,7 +9,7 @@
  *
  * Ari Suutari <suutari@iki.fi>
  *
- *	$Id: natd.h,v 1.2 1999/03/07 18:23:56 brian Exp $
+ * $FreeBSD$
  */
 
 #define PIDFILE	"/var/run/natd.pid"
diff --git a/sbin/natd/samples/natd.cf.sample b/sbin/natd/samples/natd.cf.sample
index baaa60f40cd3..77761b8dc82f 100644
--- a/sbin/natd/samples/natd.cf.sample
+++ b/sbin/natd/samples/natd.cf.sample
@@ -1,5 +1,5 @@
 #
-# $Id: natd.cf.sample,v 1.2 1998/07/04 12:07:03 brian Exp $
+# $FreeBSD$
 #
 #
 # Configuration file for natd.
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 70e1c553ee95..615b5c2feb47 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-	"$Id: mkfs.c,v 1.27 1999/02/09 17:19:18 dillon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 7d2edc00d14d..72a5b18e2bae 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\"	$Id: newfs.8,v 1.20 1998/11/29 13:09:01 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 3, 1995
 .Dt NEWFS 8
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 48473fd5f9f8..81dd7a14c67e 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: newfs.c,v 1.28 1999/02/09 17:19:19 dillon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index bb9c6e5e480d..cdfd3a86aa0f 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	newfs_msdos
 MAN8=	newfs_msdos.8
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 44bf27785a50..4e0a51c307ea 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.
 .\"
-.\"	$Id: newfs_msdos.8,v 1.4 1998/09/29 17:34:25 obrien Exp $
+.\" $FreeBSD$
 .\"
 .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 3d16b9aa8838..0d6109b5a79f 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[] =
-	"$Id: newfs_msdos.c,v 1.7 1999/01/03 02:18:57 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nextboot/nextboot.8 b/sbin/nextboot/nextboot.8
index 6219087d3f2d..75ad6d3c74cd 100644
--- a/sbin/nextboot/nextboot.8
+++ b/sbin/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: nextboot.8,v 1.8 1998/06/30 06:28:17 charnier Exp $
+.\" $FreeBSD$
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/nextboot/nextboot.c b/sbin/nextboot/nextboot.c
index b74c4297868c..5893ca38a8a8 100644
--- a/sbin/nextboot/nextboot.c
+++ b/sbin/nextboot/nextboot.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index f82cfe5b8bc1..e3d3e1cead65 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 29, 1995
 .Dt NFSD 8
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c
index e1a1ffe2e54e..ca7ecefa482e 100644
--- a/sbin/nfsd/nfsd.c
+++ b/sbin/nfsd/nfsd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 25cc33cde6ec..007668f4d052 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\"	$Id: nfsiod.8,v 1.6 1998/07/15 06:35:20 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index b97eb77718ef..65ded3544c70 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsiod.c	8.4 (Berkeley) 5/3/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/sbin/nologin/nologin.5 b/sbin/nologin/nologin.5
index 37d311ab5c94..8ce22a264715 100644
--- a/sbin/nologin/nologin.5
+++ b/sbin/nologin/nologin.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\"	$Id: nologin.5,v 1.5 1999/01/12 14:09:23 asami Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 5
diff --git a/sbin/nologin/nologin.8 b/sbin/nologin/nologin.8
index 4e7bf61aacb5..d5f4cb7a5f0b 100644
--- a/sbin/nologin/nologin.8
+++ b/sbin/nologin/nologin.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\"	$Id: nologin.8,v 1.2 1998/07/15 06:37:07 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
diff --git a/sbin/nologin/nologin.sh b/sbin/nologin/nologin.sh
index 346836f63918..52279c19ea9a 100644
--- a/sbin/nologin/nologin.sh
+++ b/sbin/nologin/nologin.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nologin.sh	8.1 (Berkeley) 6/5/93
-#	$Id$
+# $FreeBSD$
 #
 
 echo 'This account is currently not available.'
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index e08b934690d5..16a6ab25b060 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
 .\" ----------------------------------------------------------------------------
 .\" 
-.\" $Id: nos-tun.8,v 1.2 1998/05/05 06:24:12 charnier Exp $
+.\" $FreeBSD$
 .\" 
 .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 ae8a76731486..26e80d80805b 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[] =
-	"$Id: nos-tun.c,v 1.4 1998/08/02 16:06:34 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index f70e3bcda523..1df0d93b0530 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.7 1998/09/19 22:42:02 obrien Exp $
+# $FreeBSD$
 
 PROG=	ping
 MAN8=	ping.8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 722dfcd12381..565a5afed962 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: ping.8,v 1.19 1999/01/06 07:54:27 imp Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 1, 1997
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index f1a563e635a3..edbc82a22c2d 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id: ping.c,v 1.43 1999/04/25 22:33:30 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index ffae2c6de395..94baefa7d266 100644
--- a/sbin/quotacheck/preen.c
+++ b/sbin/quotacheck/preen.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: preen.c,v 1.11 1998/12/03 02:41:11 julian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 080f8851ad28..b942789b6787 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 6b1e7c038e49..a1e8487b34c1 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 79e1fa2159a0..d51b85eaf5fa 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -38,7 +38,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $Id: boot_i386.8,v 1.19 1999/06/26 21:57:08 rnordier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index c9820f7889e3..49b6e8c80f26 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\"	$Id: reboot.8,v 1.5 1998/07/15 06:51:37 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index ca3e729feaac..0bb84822fe0b 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)reboot.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/reboot.h>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 99f4c2fcb0b8..ca0e521a825c 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.8 1998/08/06 21:41:13 markm Exp $
+# $FreeBSD$
 
 PROG=	restore
 LINKS=	${BINDIR}/restore ${BINDIR}/rrestore
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index db68d66a470d..6338c24b4244 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: dirs.c,v 1.12 1998/07/28 06:20:05 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index 34900e2d5432..05ca7428a45f 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 1/7/94
- *	$Id$
+ * $FreeBSD$
  */
 
 struct entry	*addentry __P((char *, ino_t, int));
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 1d6424db239a..ca0bc842673b 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: interactive.c,v 1.6 1998/09/17 20:18:11 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index cddf32bb84c8..f6a6872c9847 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 9c9159614227..1b349468ea0c 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\"	$Id: restore.8,v 1.14 1998/09/22 10:05:27 roberto Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index f983c695fca2..33496f39adaf 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 795669ca74e6..c20521373632 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: symtab.c,v 1.5 1998/07/28 06:20:13 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 80a14a864e1a..ed3258b716a8 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: tape.c,v 1.14 1998/07/28 18:50:01 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 3a8a47d5c94c..b51f90c3a8f7 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utilities.c	8.5 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 5577995e8301..d31042118b72 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.\"	$Id: route.8,v 1.12 1998/07/28 06:25:33 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 19, 1994
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 96dc90c29d68..c664eb6177ea 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)route.c	8.3 (Berkeley) 3/19/94";
 #endif
 static const char rcsid[] =
-	"$Id: route.c,v 1.30 1999/06/01 13:14:07 ru Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index fb8c3de6b475..07255f2bc597 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,6 +1,6 @@
 # Make `routed` for FreeBSD
-# $Revision: 2.15 $
-#       $Id$
+# $Revision: 1.6 $
+# $FreeBSD$
 
 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/defs.h b/sbin/routed/defs.h
index 59a9aff33d95..ad0429656ff9 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -32,11 +32,11 @@
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifdef  sgi
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.11 $"
 #endif
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 7b40d2a6ff14..4ee69d0d7313 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "defs.h"
@@ -42,7 +42,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #include <sys/cdefs.h>
 __RCSID("$NetBSD$");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.4 $"
 
 struct interface *ifnet;		/* all interfaces */
 
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index cf5171d3863c..074f6d634541 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "defs.h"
@@ -41,7 +41,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)input.c	8.1 (Berkeley) 6/5/9
 #include <sys/cdefs.h>
 __RCSID("$NetBSD$");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.5 $"
 
 static void input(struct sockaddr_in *, struct interface *, struct interface *,
 		  struct rip *, int);
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index dfd436e5de53..aab7b8a72e6d 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "defs.h"
@@ -52,7 +52,7 @@ __RCSID("$NetBSD$");
 __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.9 $"
 
 
 pid_t	mypid;
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index b1593b86f7e7..7847fde74cea 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "defs.h"
@@ -40,7 +40,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)output.c	8.1 (Berkeley) 6/5/
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.3 $"
 
 
 u_int update_seqno;
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index 7e6a2a4beb69..78f12eb11fd0 100644
--- a/sbin/routed/parms.c
+++ b/sbin/routed/parms.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "defs.h"
@@ -42,7 +42,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.5 $"
 
 
 struct parm *parms;
diff --git a/sbin/routed/pathnames.h b/sbin/routed/pathnames.h
index 9a9466ff9bf7..b99bcc24d28e 100644
--- a/sbin/routed/pathnames.h
+++ b/sbin/routed/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index 9d45b5996d32..0c93ca705b89 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -32,7 +32,7 @@
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
@@ -46,7 +46,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c	8.1 (Berkeley) x/y/9
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.3 $"
 
 #define log(x, msg) syslog(x, msg)
 #define panic(s) {log(LOG_ERR,s); exit(1);}
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index 44fb0621290b..ab3bf620cffa 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -32,7 +32,7 @@
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef __RADIX_H_
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 4d54b33be342..6543cc6a0bfe 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "defs.h"
@@ -43,7 +43,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c	8.1 (Berkeley) x/y/9
 #elif defined(__NetBSD__)
 __RCSID"$NetBSD$");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.3 $"
 
 /* router advertisement ICMP packet */
 struct icmp_ad {
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index d357ba57e760..2366e914d543 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,4 +1,4 @@
-.\"   $Revision: 2.17 $
+.\"   $Revision: 1.12 $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index d371d5d6651d..3e8049dd6273 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -1,6 +1,6 @@
 # Make `routed` tools for BSD/OS
-# $Revision: 2.15 $
-#	$Id$
+# $Revision: 1.6 $
+# $FreeBSD$
 
 PROG=	rtquery
 MAN8=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 094a91842279..c7dcab7e157d 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,5 +1,5 @@
-.\" $Revision: 1.9 $
-.\"	$Id: rtquery.8,v 1.9 1999/05/02 13:14:16 markm Exp $
+.\" $Revision: 1.10 $
+.\" $FreeBSD$
 .\"
 .Dd June 1, 1996
 .Dt RTQUERY 8
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index a7dc23ecab77..1441699f1aea 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 char copyright[] =
@@ -62,7 +62,7 @@ static char sccsid[] __attribute__((unused))= "@(#)query.c	8.1 (Berkeley) 6/5/93
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD: rtquery.c,v 1.10 1999/02/23 10:47:41 christos Exp $");
 #endif
-#ident "$Revision$"
+#ident "$Revision: 1.12 $"
 
 #ifndef sgi
 #define _HAVE_SIN_LEN
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index fa01db3a8e20..e91a2c097578 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "defs.h"
@@ -40,7 +40,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)tables.c	8.1 (Berkeley) 6/5/
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.7 $"
 
 static struct rt_spare *rts_better(struct rt_entry *);
 static struct rt_spare rts_empty = {0,0,0,HOPCNT_INFINITY,0,0,0};
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 48d383aafbf1..fd7d474df944 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	RIPCMDS
@@ -45,7 +45,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)trace.c	8.1 (Berkeley) 6/5/9
 #elif defined(__NetBSD__)
 __RCSID("$NetBSD$");
 #endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 1.3 $"
 
 
 #ifdef sgi
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index a2c717c5994e..37e1f7184e07 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: savecore.8,v 1.6 1997/02/22 14:33:14 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 23, 1994
 .Dt SAVECORE 8
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 089845e8729d..ad3213fceaf5 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)savecore.c	8.3 (Berkeley) 1/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: savecore.c,v 1.22 1999/03/12 14:46:00 gallatin Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 876c2874cc09..bf2276b830f4 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shutdown.8	8.2 (Berkeley) 4/27/95
-.\"	$Id: shutdown.8,v 1.10 1999/06/21 06:21:04 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd Dec 11, 1998
 .Dt SHUTDOWN 8
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 43e3d31af3c2..cf40b3d0a045 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: shutdown.c,v 1.19 1999/06/21 16:06:21 ru Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index 86b38705548f..defa38531c41 100644
--- a/sbin/slattach/Makefile
+++ b/sbin/slattach/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/11/90
 #
-#	$Id$
+# $FreeBSD$
 
 PROG=	slattach
 SRCS=   slattach.c
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index b0a23c68df08..5d384569d69c 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index 36a7a3b531f1..ba599ba49875 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-	"$Id: slattach.c,v 1.34 1999/05/29 08:16:34 kris Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/spppcontrol/spppcontrol.8 b/sbin/spppcontrol/spppcontrol.8
index d375c3b71d58..39c3b2d71a45 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.
 .\"
-.\" $Id: spppcontrol.8,v 1.3 1998/08/03 06:24:59 charnier Exp jdp $
+.\" $FreeBSD$
 .\"
 .Dd October 11, 1997
 .Os
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index e6fae7654814..15af6b40d714 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: spppcontrol.c,v 1.5 1999/02/23 21:47:05 gj Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 94a996eb2142..4c044eb9eed5 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\"	$Id: startslip.1,v 1.13 1997/02/22 14:33:20 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index da9d808873f0..f0d5ce6180ef 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)startslip.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 52c174008630..9ba12e992fcc 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: swapon.8,v 1.10 1998/08/03 06:35:01 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 0480b1777f71..4d25da2cbdf6 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)swapon.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 46be1feb96b4..bbfa805063c3 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.3 1997/12/18 15:34:08 bde Exp $
+# $FreeBSD$
 
 PROG=	sysctl
 MAN8=	sysctl.8
diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c
index 07f786d82086..73777e37dca0 100644
--- a/sbin/sysctl/pathconf.c
+++ b/sbin/sysctl/pathconf.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)pathconf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index c4ac566de972..599e36f07874 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: sysctl.8,v 1.18 1999/01/10 02:10:08 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 072ffac0dc5c..404a6d6af3b1 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: sysctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: sysctl.c,v 1.20 1999/01/10 02:10:08 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 9706d4323324..d68211d64c83 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: tunefs.8,v 1.7 1998/08/03 06:41:20 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt TUNEFS 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index e002fa5c4718..261345a7a6f2 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
 #endif
 static const char rcsid[] =
-	"$Id: tunefs.c,v 1.7 1999/01/20 01:22:39 luoqi Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index a00c05dcf2c9..fb5ddf75cea0 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)umount.8	8.2 (Berkeley) 5/8/95
-.\"	$Id: umount.8,v 1.4 1997/08/20 11:40:13 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 8, 1995
 .Dt UMOUNT 8
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index f6d2392246d7..f832848d18a4 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)umount.c	8.8 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index 6462fcd04598..a22a645c1795 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile.sbin,v 1.3 1999/02/11 05:09:49 grog Exp grog $
+# $FreeBSD$
 
 MAINTAINER  =  grog@FreeBSD.org
 PROG=	vinum
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index 5173e0026667..cd58c35dfd94 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -38,7 +38,7 @@
  *
  */
 
-/* $Id: commands.c,v 1.7 1999/07/03 05:52:32 grog Exp grog $ */
+/* $FreeBSD$ */
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c
index 3f78bd33bc89..bb4901ed5cf7 100644
--- a/sbin/vinum/list.c
+++ b/sbin/vinum/list.c
@@ -39,7 +39,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: list.c,v 1.19 1999/07/03 04:00:05 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <ctype.h>
diff --git a/sbin/vinum/v.c b/sbin/vinum/v.c
index f78368a17050..bb6015d30e7d 100644
--- a/sbin/vinum/v.c
+++ b/sbin/vinum/v.c
@@ -38,7 +38,7 @@
  *
  */
 
-/* $Id: v.c,v 1.26 1999/07/03 05:53:09 grog Exp grog $ */
+/* $FreeBSD$ */
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/sbin/vinum/vext.h b/sbin/vinum/vext.h
index 614bb4c548e5..e6b032f8d801 100644
--- a/sbin/vinum/vext.h
+++ b/sbin/vinum/vext.h
@@ -35,7 +35,7 @@
  *
  */
 
-/* $Id: vext.h,v 1.12 1999/07/03 05:51:19 grog Exp grog $ */
+/* $FreeBSD$ */
 
 #define MAXARGS 64					    /* maximum number of args on a line */
 #define PLEXINITSIZE 61440				    /* this is what the system does somewhere */
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index 60c851447ece..fbb6f0581b70 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -34,7 +34,7 @@
 .\" otherwise) arising in any way out of the use of this software, even if
 .\" advised of the possibility of such damage.
 .\"
-.\" $Id: vinum.8,v 1.10 1999/07/02 07:46:13 grog Exp grog $
+.\" $FreeBSD$
 .\"
 .Dd 28 March 1999
 .Dt vinum 8
diff --git a/share/Makefile.inc b/share/Makefile.inc
index 4a22290b81b4..dbe7ccfdebca 100644
--- a/share/Makefile.inc
+++ b/share/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile.inc,v 1.2 1998/01/03 11:29:01 wosch Exp $
+# $FreeBSD$
 
 BINDIR?=	${SHAREDIR}
 BINOWN=		${SHAREOWN}
diff --git a/share/dict/Makefile b/share/dict/Makefile
index 16bf9d0148f3..20321abf8671 100644
--- a/share/dict/Makefile
+++ b/share/dict/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id$
+# $FreeBSD$
 
 # XXX MISSING:	connectives words
 FILES=	README propernames web2 web2a
diff --git a/share/dict/README b/share/dict/README
index afdc408e2132..8d6680b2914a 100644
--- a/share/dict/README
+++ b/share/dict/README
@@ -1,5 +1,5 @@
 #	@(#)README	8.1 (Berkeley) 6/5/93
-#	$Id: README,v 1.5 1998/01/25 19:20:00 wosch Exp $
+# $FreeBSD$
 
 WEB ---- (introduction provided by jaw@riacs) -------------------------
 
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 993d1aaba6a2..d83447874000 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.12 1997/02/22 12:57:48 peter Exp $
+# $FreeBSD$
 
 SUBDIR=	psd smm usd papers
 
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index 141c32d22ee4..de3497d15f33 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 SUBDIR=	beyond4.3 diskperf fsinterface kernmalloc kerntune malloc memfs \
 	newvm nqnfs px relengr sysperf \
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index 7f9858ebcfbf..4a34ff8197c1 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 SRCS=	beyond43.ms
diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile
index 2a34acc418cc..1f701059222d 100644
--- a/share/doc/papers/contents/Makefile
+++ b/share/doc/papers/contents/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	contents
diff --git a/share/doc/papers/contents/contents.ms b/share/doc/papers/contents/contents.ms
index d305ea931094..bf96340481ca 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.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .OH '''Papers Contents'
 .EH 'Papers Contents'''
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index 1b9ccd32348d..2dbe2a343300 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	diskperf
diff --git a/share/doc/papers/diskperf/conclusions.ms b/share/doc/papers/diskperf/conclusions.ms
index 9c39a5091212..9e20f1a64708 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ds RH Conclusions
 .NH
diff --git a/share/doc/papers/diskperf/tests.ms b/share/doc/papers/diskperf/tests.ms
index e50740841326..40bbe0fd6723 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ds RH Tests
 .NH
diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile
index 3eccadd88ab8..7e73162ade30 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	fsinterface
diff --git a/share/doc/papers/fsinterface/fsinterface.ms b/share/doc/papers/fsinterface/fsinterface.ms
index 6038a31db0c5..dd4bb2b931d8 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
-.\"	$Id: fsinterface.ms,v 1.5 1997/02/22 13:03:06 peter Exp $
+.\" $FreeBSD$
 .\"
 .if \nv .rm CM
 .de UX
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index 7c97c8224a0a..cda921940afa 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	kernmalloc
diff --git a/share/doc/papers/kernmalloc/kernmalloc.t b/share/doc/papers/kernmalloc/kernmalloc.t
index 0b8bb0815fa1..3b768ca50daf 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .\" reference a system routine name
 .de RN
diff --git a/share/doc/papers/kerntune/1.t b/share/doc/papers/kerntune/1.t
index 88adf40b5d68..49b653f501f8 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ds RH Introduction
 .NH 1
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index 097493f93f77..1e1bcf3f720a 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	kerntune
diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile
index db5022d978b3..5e2c318194f0 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	malloc
diff --git a/share/doc/papers/malloc/abs.ms b/share/doc/papers/malloc/abs.ms
index 041467fa97a2..b92c2d149304 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .if n .ND
 .TL
diff --git a/share/doc/papers/malloc/alternatives.ms b/share/doc/papers/malloc/alternatives.ms
index f644635b4443..36acdeecb1d0 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .ds RH Alternative implementations
 .NH
diff --git a/share/doc/papers/malloc/conclusion.ms b/share/doc/papers/malloc/conclusion.ms
index 1cf28c61fe4a..1643c9018c01 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .ds RH Conclusion and experience.
 .NH
diff --git a/share/doc/papers/malloc/implementation.ms b/share/doc/papers/malloc/implementation.ms
index 19d465b1c813..7dbb10f2a32c 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .ds RH Implementation
 .NH
diff --git a/share/doc/papers/malloc/intro.ms b/share/doc/papers/malloc/intro.ms
index 6880827af6ed..49f6acd42afa 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .ds RH Introduction
 .NH
diff --git a/share/doc/papers/malloc/kernel.ms b/share/doc/papers/malloc/kernel.ms
index e6dd0fbad264..50f654f07959 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .ds RH The kernel and memory
 .NH
diff --git a/share/doc/papers/malloc/malloc.ms b/share/doc/papers/malloc/malloc.ms
index 29203d3654e8..ced8957748ca 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .ds RH Malloc and free
 .NH
diff --git a/share/doc/papers/malloc/performance.ms b/share/doc/papers/malloc/performance.ms
index 0792dedc3386..997a5a80cf72 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .ds RH Performance
 .NH
diff --git a/share/doc/papers/malloc/problems.ms b/share/doc/papers/malloc/problems.ms
index 112e1da81f6b..cc8f55182b91 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
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .ds RH The problems
 .NH
diff --git a/share/doc/papers/memfs/Makefile b/share/doc/papers/memfs/Makefile
index 62a91786c0b7..114d7929e6a9 100644
--- a/share/doc/papers/memfs/Makefile
+++ b/share/doc/papers/memfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.7 1998/08/02 14:07:27 bde Exp $
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	memfs
diff --git a/share/doc/papers/newvm/1.t b/share/doc/papers/newvm/1.t
index 2e166fe94743..02ac8be22d1a 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .NH
 Motivations for a New Virtual Memory System
diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile
index 2bddf9d415f3..8a912980da9b 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	newvm
diff --git a/share/doc/papers/newvm/a.t b/share/doc/papers/newvm/a.t
index 41e5ff7fad3d..bb20df115a55 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .sp 2
 .ne 2i
diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile
index 316cdd79fc00..a937ed71355a 100644
--- a/share/doc/papers/nqnfs/Makefile
+++ b/share/doc/papers/nqnfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 4/20/94
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	nqnfs
diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index d068a0789266..86d52889a7d2 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	px
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index da1b8bf66002..f84170e755c5 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	releng
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index ae567bce547e..c86fb8f66d56 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	papers
 DOC=	sysperf
diff --git a/share/doc/psd/05.sysman/1.2.t b/share/doc/psd/05.sysman/1.2.t
index 1a77f773c4fc..8527a75f8f3e 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .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 8cb60a088477..edf3e10fb52e 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .sh "Interprocess communications
 .NH 3
diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile
index 6881a28cf71e..fbba0b7708d3 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
-#	$Id$
+# $FreeBSD$
 
 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/12.make/Makefile b/share/doc/psd/12.make/Makefile
index 0fad5f7396e1..b266f9b6f959 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/12.make
 SRCS=	tutorial.ms
diff --git a/share/doc/psd/13.rcs/Makefile b/share/doc/psd/13.rcs/Makefile
index 28c227fe00f4..ed497da4d8db 100644
--- a/share/doc/psd/13.rcs/Makefile
+++ b/share/doc/psd/13.rcs/Makefile
@@ -1,4 +1,4 @@
-#       $Id$
+# $FreeBSD$
 
 SUBDIR=	rcs rcs_func
 
diff --git a/share/doc/psd/13.rcs/Makefile.inc b/share/doc/psd/13.rcs/Makefile.inc
index efd41f403ac9..666dbd862ff2 100644
--- a/share/doc/psd/13.rcs/Makefile.inc
+++ b/share/doc/psd/13.rcs/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 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 13ce5229df4d..bfc41a11f52e 100644
--- a/share/doc/psd/13.rcs/rcs/Makefile
+++ b/share/doc/psd/13.rcs/rcs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/03/04 18:21:05 wosch Exp $
+# $FreeBSD$
 
 SRCS=	rcs.ms
 USE_PIC=	yes
diff --git a/share/doc/psd/13.rcs/rcs_func/Makefile b/share/doc/psd/13.rcs/rcs_func/Makefile
index 7dc0818e7860..7c78765d40ed 100644
--- a/share/doc/psd/13.rcs/rcs_func/Makefile
+++ b/share/doc/psd/13.rcs/rcs_func/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/03/04 18:21:06 wosch Exp $
+# $FreeBSD$
 
 SRCS=	rcs_func.ms
 DOC=	rcs_func
diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile
index 4a2c680e1159..6ef848949974 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/18.gprof
 SRCS=	header.me abstract.me intro.me profiling.me gathering.me \
diff --git a/share/doc/psd/19.curses/Makefile b/share/doc/psd/19.curses/Makefile
index 8de4b43783e2..37c4cb4c7e2d 100644
--- a/share/doc/psd/19.curses/Makefile
+++ b/share/doc/psd/19.curses/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id: Makefile,v 1.7 1997/02/22 13:04:35 peter Exp $
+# $FreeBSD$
 
 VOLUME=	psd/19.curses
 SRCS=	Master
diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile
index 2c8befd5e684..ce215084fbef 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/20.ipctut
 SRCS=	tutor.me
diff --git a/share/doc/psd/21.ipc/5.t b/share/doc/psd/21.ipc/5.t
index 25fd4e5bef44..8ce44b2018c1 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .\".ds RH "Advanced Topics
 .bp
diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile
index c825d14f3b65..08e53049d872 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
-#	$Id$
+# $FreeBSD$
 
 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 6bf3fb638b59..d3832282c88b 100644
--- a/share/doc/psd/22.rpcgen/Makefile
+++ b/share/doc/psd/22.rpcgen/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/22.rpcgen
 SRCS=	rpcgen.ms
diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile
index 78a0bcea7193..16247c89fff1 100644
--- a/share/doc/psd/23.rpc/Makefile
+++ b/share/doc/psd/23.rpc/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/23.rpc
 SRCS=	rpc.prog.ms
diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile
index dbff9a145e2a..8e4f2182b2ff 100644
--- a/share/doc/psd/24.xdr/Makefile
+++ b/share/doc/psd/24.xdr/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/24.xdr
 SRCS=	xdr.nts.ms
diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile
index 28bf75670c09..b2281b29243b 100644
--- a/share/doc/psd/25.xdrrfc/Makefile
+++ b/share/doc/psd/25.xdrrfc/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/25.xdrrfc
 SRCS=	xdr.rfc.ms
diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile
index 88107dea503b..b61fb9f330fb 100644
--- a/share/doc/psd/26.rpcrfc/Makefile
+++ b/share/doc/psd/26.rpcrfc/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/26.rpcrfc
 SRCS=	rpc.rfc.ms
diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile
index bcdc4274e13e..e01f6af45300 100644
--- a/share/doc/psd/27.nfsrpc/Makefile
+++ b/share/doc/psd/27.nfsrpc/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd/27.nfsrfc
 SRCS=	nfs.rfc.ms
diff --git a/share/doc/psd/28.cvs/Makefile b/share/doc/psd/28.cvs/Makefile
index 4aaa924ef057..d09702e5dace 100644
--- a/share/doc/psd/28.cvs/Makefile
+++ b/share/doc/psd/28.cvs/Makefile
@@ -1,4 +1,4 @@
-#       $Id$
+# $FreeBSD$
 
 VOLUME= psd/28.cvs
 MACROS= -ms
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 6f0a95b88c87..83b72e079c93 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.11 1997/03/04 18:20:20 wosch Exp $
+# $FreeBSD$
 
 # The following modules do not build/install:
 # 10.gdb
diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile
index 421308f3e4ea..59495e5f3420 100644
--- a/share/doc/psd/contents/Makefile
+++ b/share/doc/psd/contents/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	psd
 SRCS=	contents.ms
diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile
index 0e4235640b32..7999e324c2f4 100644
--- a/share/doc/psd/title/Makefile
+++ b/share/doc/psd/title/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 13:05:15 peter Exp $
+# $FreeBSD$
 
 VOLUME=	psd
 SRCS=	Title
diff --git a/share/doc/smm/01.setup/2.t b/share/doc/smm/01.setup/2.t
index bf1ddfb58c94..4220a6d9b811 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ds lq ``
 .ds rq ''
diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile
index 0aabf0636ef1..73b6c4da286c 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	smm/01.setup
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index 53ccfdb6b7c0..fd07ffe7c8af 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
-#	$Id$
+# $FreeBSD$
 
 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 055f7b85d80e..60fe632ad3f8 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
-#	$Id$
+# $FreeBSD$
 
 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 f97818a9d66b..e3c68ff48c56 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	smm/04.quotas
 SRCS=	quotas.ms
diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile
index cbe4794c6493..7928d2d6eafc 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
-#	$Id$
+# $FreeBSD$
 
 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/Makefile b/share/doc/smm/06.nfs/Makefile
index ff8f631a9da8..99f0762ac6ef 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
-#	$Id$
+# $FreeBSD$
 
 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 444d1c39dd3a..4ee85e24b71d 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
-#	$Id: Makefile,v 1.3 1997/02/22 13:05:49 peter Exp $
+# $FreeBSD$
 
 VOLUME=	smm/08.sendmailop
 SRCS=	op.me
diff --git a/share/doc/smm/09.sendmail/Makefile b/share/doc/smm/09.sendmail/Makefile
index f39e2d467156..f403e5d55bb6 100644
--- a/share/doc/smm/09.sendmail/Makefile
+++ b/share/doc/smm/09.sendmail/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 2/28/94
-#	$Id: Makefile,v 1.3 1997/02/22 13:05:51 peter Exp $
+# $FreeBSD$
 
 VOLUME=	smm/09.sendmail
 SRCS=	intro.me
diff --git a/share/doc/smm/10.named/Makefile b/share/doc/smm/10.named/Makefile
index 4c31e138bb1a..41c348ee5797 100644
--- a/share/doc/smm/10.named/Makefile
+++ b/share/doc/smm/10.named/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 SRCDIR=	${.CURDIR}/../../../../contrib/bind/doc/bog
 
diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile
index 56f510610c1a..ad09e787076a 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	smm/11.timedop
 SRCS=	timed.ms
diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile
index eb903b441f09..797a483190d3 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	smm/12.timed
 SRCS=	timed.ms
diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile
index a8cbbae69f28..4068b9137dcc 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
-#	$Id$
+# $FreeBSD$
 
 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 56ab245b0051..6aa898781f3a 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$Id: Makefile,v 1.12 1998/04/12 14:02:33 jkh Exp $
+# $FreeBSD$
 
 # The following modules do not describe FreeBSD:
 # 14.uucpimpl, 15.uucpnet
diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile
index 24d90896cb27..ac97e4244366 100644
--- a/share/doc/smm/contents/Makefile
+++ b/share/doc/smm/contents/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	smm
 SRCS=	contents.ms
diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile
index 2bb4347dc4eb..1cfc3d0f1071 100644
--- a/share/doc/smm/title/Makefile
+++ b/share/doc/smm/title/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 13:06:07 peter Exp $
+# $FreeBSD$
 
 VOLUME=	smm
 SRCS=	Title
diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index 166b5dd8fc29..c455e3fa3508 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
-#	$Id: Makefile,v 1.3 1997/02/22 13:06:16 peter Exp $
+# $FreeBSD$
 
 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 c87560bebccd..b4eb7d632e21 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
-#	$Id$
+# $FreeBSD$
 
 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 18afc0831460..8df4f7208726 100644
--- a/share/doc/usd/10.exref/Makefile
+++ b/share/doc/usd/10.exref/Makefile
@@ -1,4 +1,4 @@
-#       $Id$
+# $FreeBSD$
 
 SUBDIR=	exref summary 
 
diff --git a/share/doc/usd/10.exref/Makefile.inc b/share/doc/usd/10.exref/Makefile.inc
index 141bd72a5b75..931a35dfbbee 100644
--- a/share/doc/usd/10.exref/Makefile.inc
+++ b/share/doc/usd/10.exref/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 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 1a7ad22d34d7..7af18f93ef38 100644
--- a/share/doc/usd/10.exref/exref/Makefile
+++ b/share/doc/usd/10.exref/exref/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/07/01 16:20:56 bde Exp $
+# $FreeBSD$
 
 SRCS=	ex.rm
 
diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile
index 2a8b6f368898..198bf6e2e65c 100644
--- a/share/doc/usd/10.exref/summary/Makefile
+++ b/share/doc/usd/10.exref/summary/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/03/02 14:07:40 wosch Exp $
+# $FreeBSD$
 
 SRCS=	ex.summary
 DOC=	summary
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index 199fc681cb79..ea96ddfee238 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	usd/11.edit
 SRCS=	edittut.ms
diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index c45870e92b91..0f885a0aefb5 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,4 +1,4 @@
-#       $Id$
+# $FreeBSD$
 
 SUBDIR=	vi viapwh summary 
 
diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc
index 8950c9bc77ed..93562246bdb6 100644
--- a/share/doc/usd/12.vi/Makefile.inc
+++ b/share/doc/usd/12.vi/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 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 24306d807e62..753f837b3d34 100644
--- a/share/doc/usd/12.vi/summary/Makefile
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/03/02 14:07:46 wosch Exp $
+# $FreeBSD$
 
 SRCS=	vi.summary
 DOC=	summary
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
index eba96c6f5334..dfd199f22bea 100644
--- a/share/doc/usd/12.vi/vi/Makefile
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/03/02 14:07:47 wosch Exp $
+# $FreeBSD$
 
 SRCS=	vi.in vi.chars
 #DOC=	tutorial
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
index 156cad8c8461..baad1ce71e2c 100644
--- a/share/doc/usd/12.vi/viapwh/Makefile
+++ b/share/doc/usd/12.vi/viapwh/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/03/02 14:07:50 wosch Exp $
+# $FreeBSD$
 
 SRCS=	vi.apwh.ms
 DOC=	viapwh
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index cf4b99bd995d..70bf70b6bacc 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
-#	$Id: Makefile,v 1.6 1997/02/22 13:06:31 peter Exp $
+# $FreeBSD$
 
 VOLUME=	usd/13.viref
 SRCS=	vi.ref
diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile
index 3a5456a89776..faf76bbb64f3 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	usd/18.msdiffs
 SRCS=	ms.diffs
diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile
index 780c2b7669eb..1febb24810f1 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	usd/19.memacros
 SRCS=	intro.me
diff --git a/share/doc/usd/19.memacros/intro.me b/share/doc/usd/19.memacros/intro.me
index b6b67969916f..c5e2012400d2 100644
--- a/share/doc/usd/19.memacros/intro.me
+++ b/share/doc/usd/19.memacros/intro.me
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.me	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .UC 7
 .ll 6.5i
diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile
index 8833858ff52a..98432e7dcb40 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
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	usd/20.meref
 SRCS=	ref.me
diff --git a/share/doc/usd/30.rogue/Makefile b/share/doc/usd/30.rogue/Makefile
index 37e934322496..cd8c0efe08e3 100644
--- a/share/doc/usd/30.rogue/Makefile
+++ b/share/doc/usd/30.rogue/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.6 1997/02/22 13:06:45 peter Exp $
+# $FreeBSD$
 
 .if exists(${.CURDIR}/../../../../games)
 VOLUME=	usd/30.rogue
diff --git a/share/doc/usd/31.trek/Makefile b/share/doc/usd/31.trek/Makefile
index fd2517ecdf72..d3945238d7da 100644
--- a/share/doc/usd/31.trek/Makefile
+++ b/share/doc/usd/31.trek/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.5 1997/02/22 13:06:48 peter Exp $
+# $FreeBSD$
 
 .if exists(${.CURDIR}/../../../../games)
 VOLUME=	usd/31.trek
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index 9349d2f110c8..5424e865ef5f 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 4/20/94
-#	$Id: Makefile,v 1.6 1997/02/22 13:06:12 peter Exp $
+# $FreeBSD$
 
 # The following modules are encumbered:
 # 01.begin 02.learn 03.shell 05.dc 06.bc 09.edtut 10.edadv 15.sed 16.awk
diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile
index b7bc9c0cb0f0..4b9a691cf15f 100644
--- a/share/doc/usd/contents/Makefile
+++ b/share/doc/usd/contents/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 VOLUME=	usd
 SRCS=	contents.ms
diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile
index 2dda21ca954d..8aba70622bc9 100644
--- a/share/doc/usd/title/Makefile
+++ b/share/doc/usd/title/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 13:06:56 peter Exp $
+# $FreeBSD$
 
 VOLUME=	usd
 SRCS=	Title
diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile
index 685c2348f20e..69dc00b759a7 100644
--- a/share/examples/FreeBSD_version/Makefile
+++ b/share/examples/FreeBSD_version/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	FreeBSD_version
 NOMAN=
diff --git a/share/examples/Makefile b/share/examples/Makefile
index fa630aaade5e..3591fc648403 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.24 1999/06/24 09:45:26 sheldonh Exp $
+# $FreeBSD$
 #
 # Doing a make install builds /usr/share/examples
 
diff --git a/share/examples/atapi/burnaudio b/share/examples/atapi/burnaudio
index edec71e79b2a..f1e1056fa8d6 100755
--- a/share/examples/atapi/burnaudio
+++ b/share/examples/atapi/burnaudio
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 
 device=/dev/r$1
diff --git a/share/examples/atapi/burndata b/share/examples/atapi/burndata
index 0d1fd126bea9..0a7577f4ea0c 100755
--- a/share/examples/atapi/burndata
+++ b/share/examples/atapi/burndata
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 
 device=/dev/r$1
 wormcontrol -f$device prepdisk double
diff --git a/share/examples/atm/NOTES b/share/examples/atm/NOTES
index 631718817837..aad41906178e 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.
 
 
 
-	@(#) $Id: NOTES,v 1.1 1997/08/22 22:11:17 mks Exp $
+	@(#) $FreeBSD$
 
diff --git a/share/examples/atm/README b/share/examples/atm/README
index 73aa74765905..a2e23f28bbbf 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.
 
 --------------------------------------------------------------------------------
 
-	@(#) $Id: README,v 1.4 1998/08/07 19:23:36 mks Exp $
+	@(#) $FreeBSD$
 
diff --git a/share/examples/atm/Startup b/share/examples/atm/Startup
index 4c0ec7d80c47..8898e45c8821 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.
 
-	@(#) $Id: Startup,v 1.6 1998/08/26 21:37:42 johnc Exp $
+	@(#) $FreeBSD$
 
diff --git a/share/examples/atm/atm-config.sh b/share/examples/atm/atm-config.sh
index 40606d41eb0e..b15060e83714 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.
 #
-#	@(#) $Id$
+#	@(#) $FreeBSD$
 #
 #
 
diff --git a/share/examples/atm/atm-sockets.txt b/share/examples/atm/atm-sockets.txt
index 17436f14492f..b4cc8e9d00d1 100644
--- a/share/examples/atm/atm-sockets.txt
+++ b/share/examples/atm/atm-sockets.txt
@@ -568,5 +568,5 @@ main(argc, argv)
 	exit(0);
 }
 
-	@(#) $Id: atm-sockets.txt,v 1.1 1998/09/15 08:22:49 phk Exp $
+	@(#) $FreeBSD$
 
diff --git a/share/examples/atm/cpcs-design.txt b/share/examples/atm/cpcs-design.txt
index aecfa8179925..94901f23998e 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.
 
 
-	@(#) $Id: cpcs.design,v 1.1.1.1 1996/12/04 20:48:14 mks Exp $
+	@(#) $FreeBSD$
 
diff --git a/share/examples/atm/sscf-design.txt b/share/examples/atm/sscf-design.txt
index a6e3f9ef1bac..5334d74bdbac 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
 
 
-	@(#) $Id: sscf.design,v 1.1.1.1 1996/12/04 20:48:17 mks Exp $
+	@(#) $FreeBSD$
 
diff --git a/share/examples/atm/sscop-design.txt b/share/examples/atm/sscop-design.txt
index 009f2426dd7d..2b546bd6aeac 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)
 
 
-	@(#) $Id: sscop.design,v 1.1.1.1 1996/12/04 20:48:17 mks Exp $
+	@(#) $FreeBSD$
 
diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README
index 9766d3f138bf..b8eb8a0f3a16 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>
 
-$Id: README,v 1.1 1998/12/22 12:15:45 abial Exp $
+$FreeBSD$
diff --git a/share/examples/bootforth/boot.4th b/share/examples/bootforth/boot.4th
index 467e968f962a..631775b304f7 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.
-\ $Id$
+\ $FreeBSD$
 
 \ Load the screen manipulation words
 
diff --git a/share/examples/bootforth/frames.4th b/share/examples/bootforth/frames.4th
index 9895a74466be..ff91c5b7ec87 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... ;-/
-\ $Id$
+\ $FreeBSD$
 
 marker task-frames.4th
 
diff --git a/share/examples/bootforth/loader.rc b/share/examples/bootforth/loader.rc
index ef0f96063fab..d216a460416f 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.
-\ $Id: loader.rc,v 1.1 1999/05/14 18:06:27 dcs Exp $
+\ $FreeBSD$
 
 cr .( Loading Forth extensions:)
 
diff --git a/share/examples/bootforth/menu.4th b/share/examples/bootforth/menu.4th
index 55359dc0d0b7..5c5c3e98c74e 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... :-/
-\ $Id: menu.4th,v 1.2 1998/12/31 14:06:30 abial Exp $
+\ $FreeBSD$
 
 : title
 	f_single
diff --git a/share/examples/bootforth/menuconf.4th b/share/examples/bootforth/menuconf.4th
index 2711204f89ce..97efd5af8af4 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... :-/
-\ $Id$
+\ $FreeBSD$
 
 : title
 	f_single
diff --git a/share/examples/bootforth/screen.4th b/share/examples/bootforth/screen.4th
index 4b0a01e7c982..3ea79e453d80 100644
--- a/share/examples/bootforth/screen.4th
+++ b/share/examples/bootforth/screen.4th
@@ -1,5 +1,5 @@
 \ Screen manipulation related words.
-\ $Id$
+\ $FreeBSD$
 
 marker task-screen.4th
 
diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index 8cfbed8d35b5..06d0a928ce1c 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -1,4 +1,4 @@
-# $Id: README,v 1.13 1998/06/26 01:48:04 jkh Exp $
+# $FreeBSD$
 
 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 2296fb8fd5cd..2db0c6b47e24 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -1,4 +1,4 @@
-# $Id: cvs-supfile,v 1.20 1999/05/25 05:38:26 jdp Exp $
+# $FreeBSD$
 #
 # 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 3820d5e84a2e..cc4db5383b65 100644
--- a/share/examples/cvsup/doc-supfile
+++ b/share/examples/cvsup/doc-supfile
@@ -1,4 +1,4 @@
-# $Id: doc-supfile,v 1.13 1999/02/11 18:14:03 jdp Exp $
+# $FreeBSD$
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current source tree.
diff --git a/share/examples/cvsup/gnats-supfile b/share/examples/cvsup/gnats-supfile
index 004f74736f06..640915fbe3d4 100644
--- a/share/examples/cvsup/gnats-supfile
+++ b/share/examples/cvsup/gnats-supfile
@@ -1,4 +1,4 @@
-# $Id: gnats-supfile,v 1.1 1998/04/20 11:26:29 jb Exp $
+# $FreeBSD$
 #
 # 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 a533df41e3f9..ecb174683ab1 100644
--- a/share/examples/cvsup/ports-supfile
+++ b/share/examples/cvsup/ports-supfile
@@ -1,4 +1,4 @@
-# $Id: ports-supfile,v 1.16 1999/04/08 08:06:30 asami Exp $
+# $FreeBSD$
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current ports collection.
diff --git a/share/examples/cvsup/secure-cvs-supfile b/share/examples/cvsup/secure-cvs-supfile
index 0b385bccd62b..26ba58ddba07 100644
--- a/share/examples/cvsup/secure-cvs-supfile
+++ b/share/examples/cvsup/secure-cvs-supfile
@@ -1,4 +1,4 @@
-# $Id: secure-cvs-supfile,v 1.7 1997/10/02 00:01:33 jkh Exp $
+# $FreeBSD$
 #
 # This file contains all of the "CVSup collections" that make up the CVS
 # development tree of the FreeBSD international secure distribution.  If
diff --git a/share/examples/cvsup/secure-stable-supfile b/share/examples/cvsup/secure-stable-supfile
index 1ab1b15b37d3..4f1f1fd4eca9 100644
--- a/share/examples/cvsup/secure-stable-supfile
+++ b/share/examples/cvsup/secure-stable-supfile
@@ -1,4 +1,4 @@
-# $Id: secure-stable-supfile,v 1.10 1999/02/11 18:04:17 jdp Exp $
+# $FreeBSD$
 #
 # This file contains all of the "CVSup collections" that make up the
 # source tree of the FreeBSD-stable international secure distribution.
diff --git a/share/examples/cvsup/secure-supfile b/share/examples/cvsup/secure-supfile
index 1c786e3f24f1..dac08070bee8 100644
--- a/share/examples/cvsup/secure-supfile
+++ b/share/examples/cvsup/secure-supfile
@@ -1,4 +1,4 @@
-# $Id: secure-supfile,v 1.8 1997/10/02 00:01:34 jkh Exp $
+# $FreeBSD$
 #
 # This file contains all of the "CVSup collections" that make up the
 # source tree of the FreeBSD-current international secure distribution.
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index 218005c0004d..10b14d0445f7 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -1,4 +1,4 @@
-# $Id: stable-supfile,v 1.14 1999/02/11 18:14:03 jdp Exp $
+# $FreeBSD$
 #
 # 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 4efb5f31b335..5a090868e5ee 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -1,4 +1,4 @@
-# $Id: standard-supfile,v 1.13 1999/02/11 18:14:03 jdp Exp $
+# $FreeBSD$
 #
 # 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 09eb2d13878c..45c375016353 100644
--- a/share/examples/cvsup/www-supfile
+++ b/share/examples/cvsup/www-supfile
@@ -1,4 +1,4 @@
-# $Id: www-supfile,v 1.13 1999/02/11 18:14:03 jdp Exp $
+# $FreeBSD$
 #
 # This file contains all of the "CVSup collections" that make up the
 # FreeBSD-current source tree.
diff --git a/share/examples/drivers/make_device_driver.sh b/share/examples/drivers/make_device_driver.sh
index 6448984e9981..81a7db4f9679 100755
--- a/share/examples/drivers/make_device_driver.sh
+++ b/share/examples/drivers/make_device_driver.sh
@@ -29,7 +29,7 @@ DONE
 cat >${UPPER} <<DONE
 # Configuration file for kernel type: ${UPPER}
 ident	${UPPER}
-# \$Id: make_device_driver.sh,v 1.4 1998/10/22 16:10:29 bde Exp $"
+# \$FreeBSD$"
 DONE
 
 grep -v GENERIC < GENERIC >>${UPPER}
@@ -45,7 +45,7 @@ cat >../isa/${1}.c <<DONE
  * Copyright ME
  *
  * ${1} driver
- * \$Id: make_device_driver.sh,v 1.4 1998/10/22 16:10:29 bde Exp $
+ * \$FreeBSD$
  */
 
 
diff --git a/share/examples/drivers/make_pseudo_driver.sh b/share/examples/drivers/make_pseudo_driver.sh
index 072e6c942e64..32cce89d0a93 100644
--- a/share/examples/drivers/make_pseudo_driver.sh
+++ b/share/examples/drivers/make_pseudo_driver.sh
@@ -21,7 +21,7 @@ DONE
 cat >${UPPER} <<DONE
 # Configuration file for kernel type: ${UPPER}
 ident	${UPPER}
-# \$Id: make_pseudo_driver.sh,v 1.3 1998/10/22 16:12:16 bde Exp $"
+# \$FreeBSD$"
 DONE
 
 grep -v GENERIC < GENERIC >>${UPPER}
@@ -37,7 +37,7 @@ cat >../../dev/${1}.c <<DONE
  * Copyright ME
  *
  * ${1} driver
- * \$Id: make_pseudo_driver.sh,v 1.3 1998/10/22 16:12:16 bde Exp $
+ * \$FreeBSD$
  */
 
 
diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples
index 370e46aa2fd9..38d3eaafc5db 100644
--- a/share/examples/etc/README.examples
+++ b/share/examples/etc/README.examples
@@ -1,4 +1,4 @@
-$Id: README.examples,v 1.3 1997/02/22 13:55:51 peter Exp $
+$FreeBSD$
 
 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/find_interface/Makefile b/share/examples/find_interface/Makefile
index fcc330cc1949..184c6417702b 100644
--- a/share/examples/find_interface/Makefile
+++ b/share/examples/find_interface/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	find_interface
 NOMAN=
diff --git a/share/examples/find_interface/find_interface.c b/share/examples/find_interface/find_interface.c
index 4a8391fa7836..73a7fe839d79 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/share/examples/isdn/Overview b/share/examples/isdn/Overview
index 2f2fc181a81d..e8e09e2c3cd5 100644
--- a/share/examples/isdn/Overview
+++ b/share/examples/isdn/Overview
@@ -4,7 +4,7 @@
 
 	Copyright (c) 1998 Hellmuth Michaelis. All rights reserved.
 
-	$Id: Overview,v 1.3 1998/10/27 10:28:54 hm Exp $
+ $FreeBSD$
 
 	Last edit-date: [Tue Oct 27 11:26:03 1998]
 
diff --git a/share/examples/isdn/ROADMAP b/share/examples/isdn/ROADMAP
index 54f6721b5fb8..c228984484cb 100644
--- a/share/examples/isdn/ROADMAP
+++ b/share/examples/isdn/ROADMAP
@@ -2,7 +2,7 @@
 	Roadmap of isdn4bsd as integrated into FreeBSD
 	==============================================
 
-	$Id:$
+ $FreeBSD$
 
 	last edit-date: [Mon Jan 18 14:47:09 1999]
 
diff --git a/share/examples/isdn/isdnd_acct b/share/examples/isdn/isdnd_acct
index 6da5fc52c0f4..be97a4ae458f 100644
--- a/share/examples/isdn/isdnd_acct
+++ b/share/examples/isdn/isdnd_acct
@@ -29,7 +29,7 @@
 #	accounting report script for the isdnd daemon accounting info
 #	-------------------------------------------------------------
 #
-#	$Id: isdnd_acct,v 1.2 1999/05/05 14:25:59 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Wed May  5 16:24:16 1999]
 #
diff --git a/share/examples/kld/cdev/module/Makefile b/share/examples/kld/cdev/module/Makefile
index 9e95e85b1ddd..8fedcfc14264 100644
--- a/share/examples/kld/cdev/module/Makefile
+++ b/share/examples/kld/cdev/module/Makefile
@@ -34,7 +34,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: Makefile,v 1.1 1998/12/11 10:44:30 dfr Exp $
+# $FreeBSD$
 #
 # Copyright (c) 1993 Terrence R. Lambert.
 # All rights reserved.
diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile
index fa3f9f83a267..001fde1d11e1 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.
 #
-# $Id: Makefile,v 1.5 1997/02/22 13:55:56 peter Exp $
+# $FreeBSD$
 #
 PROG=	testcdev
 NOMAN=
diff --git a/share/examples/kld/syscall/module/syscall.c b/share/examples/kld/syscall/module/syscall.c
index 1bfb4823fd8c..2376725ed93e 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.
  *
- *     $Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/share/examples/kld/syscall/test/call.c b/share/examples/kld/syscall/test/call.c
index 0e4b70e1fa60..9183997821cd 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.
  *
- *     $Id: call.c,v 1.1 1999/01/09 14:26:22 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c
index 1a8e20784457..3147c47687c7 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.
  *
- *  $Id: demo.c,v 1.16 1997/08/17 20:46:55 sos Exp sos $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile
index 96848c8edd95..e1e7e9faf090 100644
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	perfmon
 NOMAN=
diff --git a/share/examples/perfmon/README b/share/examples/perfmon/README
index 1a339b86494e..ccd6877a175a 100644
--- a/share/examples/perfmon/README
+++ b/share/examples/perfmon/README
@@ -21,4 +21,4 @@ The following options are not implemented on Pentium CPUs:
 There is one mandatory argument, which must be the number of the counter.
 All numbers can be specified in any format acceptable to strtol(3).
 
-$Id$
+$FreeBSD$
diff --git a/share/examples/perfmon/perfmon.c b/share/examples/perfmon/perfmon.c
index b6c9ff5d8ce4..34e38849b22b 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.
  *
- *	$Id: perfmon.c,v 1.3 1997/02/22 13:55:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile
index c77260c8d32a..1836d8abc17c 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.
 #
-# $Id$
+# $FreeBSD$
 
 PROG=	ppilcd
 NOMAN=	YES
diff --git a/share/examples/ppi/ppilcd.c b/share/examples/ppi/ppilcd.c
index 4ad7e2aaee01..91a3effcbec9 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.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/share/examples/ppp/chap-auth b/share/examples/ppp/chap-auth
index 52e9a97ffbde..1e56b07575c0 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.
 #
-#	$Id:$
+# $FreeBSD$
 
 #
 # Display a window to request a users CHAP secret, accepting the relevant
diff --git a/share/examples/ppp/login-auth b/share/examples/ppp/login-auth
index d21f31dd8e0c..e866e1d9c092 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.
 #
-#	$Id:$
+# $FreeBSD$
 
 #
 # 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 659634b2661a..0e6ac7f17100 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.
 #
-#	$Id: ppp.conf.isdn,v 1.1 1999/08/09 22:57:47 brian Exp $
+# $FreeBSD$
 
 # 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 7ceb120dbe48..85061cd92580 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -4,7 +4,7 @@
 #
 #           Originally written by Toshiharu OHNO
 #
-# $Id: ppp.conf.sample,v 1.6 1999/07/27 23:44:29 brian Exp $
+# $FreeBSD$
 #
 #################################################################
 
diff --git a/share/examples/ppp/ppp.conf.span-isp b/share/examples/ppp/ppp.conf.span-isp
index e52b56c05069..5bf42a777d5a 100644
--- a/share/examples/ppp/ppp.conf.span-isp
+++ b/share/examples/ppp/ppp.conf.span-isp
@@ -1,4 +1,4 @@
-# $Id:$
+# $FreeBSD$
 
 # 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 afe8e7da6f39..e8ec5fc90f39 100644
--- a/share/examples/ppp/ppp.conf.span-isp.working
+++ b/share/examples/ppp/ppp.conf.span-isp.working
@@ -1,4 +1,4 @@
-# $Id:$
+# $FreeBSD$
 
 # 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 c5c488ac9be9..b2a073c070fd 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.
 #
 #
-# $Id: ppp.linkdown.sample,v 1.2 1998/11/05 23:14:19 brian Exp $
+# $FreeBSD$
 #
 #########################################################################
 
diff --git a/share/examples/ppp/ppp.linkdown.span-isp b/share/examples/ppp/ppp.linkdown.span-isp
index 14853d93e933..ae00b57cdd3c 100644
--- a/share/examples/ppp/ppp.linkdown.span-isp
+++ b/share/examples/ppp/ppp.linkdown.span-isp
@@ -1,4 +1,4 @@
-# $Id:$
+# $FreeBSD$
 
 # 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 1d3f76036742..104e8c3b5b69 100644
--- a/share/examples/ppp/ppp.linkdown.span-isp.working
+++ b/share/examples/ppp/ppp.linkdown.span-isp.working
@@ -1,4 +1,4 @@
-# $Id:$
+# $FreeBSD$
 
 # 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 76b423645bca..18073cf712e7 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.
 #
 #
-# $Id: ppp.linkup.sample,v 1.14 1998/05/21 21:45:47 brian Exp $
+# $FreeBSD$
 #
 #########################################################################
 
diff --git a/share/examples/ppp/ppp.linkup.span-isp b/share/examples/ppp/ppp.linkup.span-isp
index 46f2fbea5a91..1d0cc9b68143 100644
--- a/share/examples/ppp/ppp.linkup.span-isp
+++ b/share/examples/ppp/ppp.linkup.span-isp
@@ -1,4 +1,4 @@
-# $Id:$
+# $FreeBSD$
 
 # 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 96942a981d7b..9e7e5eb5bf66 100644
--- a/share/examples/ppp/ppp.linkup.span-isp.working
+++ b/share/examples/ppp/ppp.linkup.span-isp.working
@@ -1,4 +1,4 @@
-# $Id:$
+# $FreeBSD$
 
 # 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 14bcc9e59594..57d2375fb6b0 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.
 #  
-# $Id: ppp.secret.sample,v 1.8 1998/08/07 18:44:31 brian Exp $
+# $FreeBSD$
 #
 ##################################################
 
diff --git a/share/examples/ppp/ppp.secret.span-isp b/share/examples/ppp/ppp.secret.span-isp
index 4a0029f14000..8370f379717e 100644
--- a/share/examples/ppp/ppp.secret.span-isp
+++ b/share/examples/ppp/ppp.secret.span-isp
@@ -1,4 +1,4 @@
-# $Id:$
+# $FreeBSD$
 
 # 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 47eec36bc333..cc8bc3d63dbe 100644
--- a/share/examples/ppp/ppp.secret.span-isp.working
+++ b/share/examples/ppp/ppp.secret.span-isp.working
@@ -1,4 +1,4 @@
-# $Id:$
+# $FreeBSD$
 
 # 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/printing/README b/share/examples/printing/README
index 7aa05d16ee70..f83eaa9c236a 100644
--- a/share/examples/printing/README
+++ b/share/examples/printing/README
@@ -1,4 +1,4 @@
-# $Id: README,v 1.4 1997/02/22 13:55:59 peter Exp $ 
+# $FreeBSD$ 
 #
 # 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 96582bb7607e..67f2a4ec24f0 100644
--- a/share/examples/scsi_target/Makefile
+++ b/share/examples/scsi_target/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	scsi_target
 SRCS=	scsi_target.c
diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c
index cad82c31e40a..5c1efb186970 100644
--- a/share/examples/scsi_target/scsi_target.c
+++ b/share/examples/scsi_target/scsi_target.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_target.c,v 1.3 1999/03/05 23:12:02 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/share/info/Makefile b/share/info/Makefile
index d01b42a7ed48..7502e3ab5615 100644
--- a/share/info/Makefile
+++ b/share/info/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile    8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.5 1998/01/03 14:06:26 wosch Exp $
+# $FreeBSD$
 
 NOOBJ=  noobj
 
diff --git a/share/isdn/Makefile b/share/isdn/Makefile
index 8649ab266602..99025d809128 100644
--- a/share/isdn/Makefile
+++ b/share/isdn/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.1 1998/12/27 21:46:39 phk Exp $
+# $FreeBSD$
 
 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/man/Makefile b/share/man/Makefile
index ae353ff39b52..259dc9a77b57 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/16/94
-#	$Id$
+# $FreeBSD$
 
 # XXX MISSING:	man3f
 SUBDIR=	man1 man3 man4 man5 man6 man7 man8 man9
diff --git a/share/man/man0/Makefile b/share/man/man0/Makefile
index f612c8eb25bb..688c43f34d51 100644
--- a/share/man/man0/Makefile
+++ b/share/man/man0/Makefile
@@ -3,7 +3,7 @@
 # All rights reserved.
 #
 #	From: @(#)Makefile	8.2 (Berkeley) 1/29/94
-#	$Id$
+# $FreeBSD$
 #
 SRCS=	man1 man2 man3 man4 man5 man6 man7 man8
 
diff --git a/share/man/man0/title.urm b/share/man/man0/title.urm
index cbca64600d9a..92664033d26d 100644
--- a/share/man/man0/title.urm
+++ b/share/man/man0/title.urm
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)title.urm	8.7 (Berkeley) 4/20/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .af % i
 .EH ''''
diff --git a/share/man/man0/xrs.pl b/share/man/man0/xrs.pl
index cbdbdbf05a13..feb6b5f654b7 100755
--- a/share/man/man0/xrs.pl
+++ b/share/man/man0/xrs.pl
@@ -21,7 +21,7 @@
 #
 # usage: xrs manpages ...
 #
-# $Id$
+# $FreeBSD$
 
 sub mysort {
 
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index f1ed384cd840..6fc2d4df290d 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.6 1998/12/20 06:27:00 bde Exp $
+# $FreeBSD$
 
 MAN1=	cd.1 intro.1 wait.1
 MLINKS=	intro.1 introduction.1
diff --git a/share/man/man1/cd.1 b/share/man/man1/cd.1
index ea0e6409ced7..2b812eb5d9d6 100644
--- a/share/man/man1/cd.1
+++ b/share/man/man1/cd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cd.1	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt CD 1
diff --git a/share/man/man1/intro.1 b/share/man/man1/intro.1
index 072aa9e53787..e17807dfd8b4 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
-.\"	$Id: intro.1,v 1.13 1999/03/20 04:03:56 billf Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt INTRO 1
diff --git a/share/man/man1/wait.1 b/share/man/man1/wait.1
index e20768a09200..3529f56fac71 100644
--- a/share/man/man1/wait.1
+++ b/share/man/man1/wait.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wait.1	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt WAIT 1
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index f8096bb5f7be..f9691922e263 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
-#	$Id: Makefile,v 1.13 1998/02/04 22:30:20 jlemon Exp $
+# $FreeBSD$
 
 MAN3=	assert.3 bitstring.3 end.3 fpgetround.3 intro.3 pthread.3 queue.3 \
 	stdarg.3 sysexits.3
diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3
index 76863607e483..eaf1f55b844a 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
-.\"	$Id: assert.3,v 1.5 1999/01/26 16:59:02 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 26, 1999
 .Dt ASSERT 3
diff --git a/share/man/man3/bitstring.3 b/share/man/man3/bitstring.3
index 565e7d11cc7d..e05a1935adc5 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
-.\"	$Id: bitstring.3,v 1.4 1997/04/13 14:19:58 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 19, 1993
 .Dt BITSTRING 3
diff --git a/share/man/man3/end.3 b/share/man/man3/end.3
index a2ab4c0b1ac5..a23713d9a68e 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 24, 1994
 .Dt END 3
diff --git a/share/man/man3/fpgetround.3 b/share/man/man3/fpgetround.3
index d60ef1baa3bd..87064bc2f295 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
-.\"	$Id: fpgetround.3,v 1.5 1997/04/13 14:19:59 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 23, 1993
 .Dt FPGETROUND 3
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index dbef4f5f11f8..623cb208ee11 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
-.\"	$Id: intro.3,v 1.5 1997/02/22 13:24:16 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt INTRO 3
diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index d2888f933943..4e6e56b260a4 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.
 .\"
-.\"	$Id: pthread.3,v 1.6 1998/04/10 09:33:09 jb Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 10, 1998
 .Dt PTHREAD 3
diff --git a/share/man/man3/pthread_cleanup_pop.3 b/share/man/man3/pthread_cleanup_pop.3
index db0547c57736..faae8ba450fc 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 cf6682363647..4f260affbc32 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 dbaaa851a548..6112695c9893 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 3efe8b61afa9..75ae99686f41 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 1a9415500dc8..2783672ce3d9 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_INIT 3
diff --git a/share/man/man3/pthread_cond_signal.3 b/share/man/man3/pthread_cond_signal.3
index 574862ec3104..e3a22f88cf6c 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 6af8430dd2f2..de427f8d4c0a 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.
 .\"
-.\"     $Id: pthread_cond_timedwait.3,v 1.4 1999/07/12 20:49:03 nik Exp $
+.\" $FreeBSD$
 .\"
 .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 9d6294f2715c..435cd41f2be6 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.
 .\"
-.\"     $Id: pthread_cond_wait.3,v 1.4 1999/07/12 20:49:05 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1998
 .Dt PTHREAD_COND_WAIT 3
diff --git a/share/man/man3/pthread_create.3 b/share/man/man3/pthread_create.3
index 3342296db8d3..cdc28a56c854 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_CREATE 3
diff --git a/share/man/man3/pthread_detach.3 b/share/man/man3/pthread_detach.3
index 34797a25b643..a3fffc6056ea 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 cb158682c74e..5d443b3cb2c6 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 4fbf4a64611a..ff452ca94215 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.
 .\"
-.\"     $Id: pthread_exit.3,v 1.5 1999/07/12 20:49:07 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_EXIT 3
diff --git a/share/man/man3/pthread_getspecific.3 b/share/man/man3/pthread_getspecific.3
index b7875fbdb846..a56254108f6e 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.
 .\"
-.\"	$Id: pthread_getspecific.3,v 1.4 1997/02/22 15:05:24 peter Exp $
+.\" $FreeBSD$
 .\"
 .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 d677aa10d915..e32ad40613b7 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 6327b92eb315..76fc1879326c 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 4328e29b5061..39fb19ea9af8 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_KEY_DELETE 3
diff --git a/share/man/man3/pthread_mutex_destroy.3 b/share/man/man3/pthread_mutex_destroy.3
index fa4fdc31d7e8..517d6ebadf5d 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 07c9e91852e1..926b034b6011 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1998
 .Dt PTHREAD_MUTEX_INIT 3
diff --git a/share/man/man3/pthread_mutex_lock.3 b/share/man/man3/pthread_mutex_lock.3
index 6e7901db7c23..36473733ce11 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_LOCK 3
diff --git a/share/man/man3/pthread_mutex_trylock.3 b/share/man/man3/pthread_mutex_trylock.3
index 6fef180bb966..30faaa81bd4d 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .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 cebfbd50dc6d..27a4c337fe37 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 30, 1998
 .Dt PTHREAD_MUTEX_UNLOCK 3
diff --git a/share/man/man3/pthread_once.3 b/share/man/man3/pthread_once.3
index 27130bcef349..2dcea493cb9c 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_ONCE 3
diff --git a/share/man/man3/pthread_rwlock_destroy.3 b/share/man/man3/pthread_rwlock_destroy.3
index b67a2e7beb0d..14691c44bbf8 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.
 .\"
-.\"	$Id: pthread_rwlock_destroy.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .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 a56169507b48..306af61bbeb4 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .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 9181be96cd5d..bea219de0100 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCK_RDLOCK 3
diff --git a/share/man/man3/pthread_rwlock_unlock.3 b/share/man/man3/pthread_rwlock_unlock.3
index 1c9fd05797ad..7ad52b257120 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .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 a5a367406566..b6a2312a79d6 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .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 35ac21719e97..2d67041ba161 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.
 .\"
-.\"	$Id: pthread_rwlockattr_destroy.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .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 4b8d9937104d..d2028dc58c6d 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.
 .\"
-.\"	$Id: pthread_rwlockattr_getpshared.3,v 1.2 1999/03/05 18:43:00 bde Exp $
+.\" $FreeBSD$
 .\"
 .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 54bbedce2cab..ac191260c66d 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.
 .\"
-.\"	$Id: pthread_rwlockattr_init.3,v 1.1 1998/09/07 19:01:43 alex Exp $
+.\" $FreeBSD$
 .\"
 .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 e63debfc400b..b98e081aa3a7 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 4, 1998
 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3
diff --git a/share/man/man3/pthread_self.3 b/share/man/man3/pthread_self.3
index ef1d88d88b68..be524b9345b9 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SELF 3
diff --git a/share/man/man3/pthread_setspecific.3 b/share/man/man3/pthread_setspecific.3
index c8e2b1a529e8..89a416f57c61 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt PTHREAD_SETSPECIFIC 3
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index 364be869f1c9..d84108f9d68e 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
-.\"	$Id: queue.3,v 1.12 1997/03/19 02:57:50 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 24, 1994
 .Dt QUEUE 3
diff --git a/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index 897d471053e5..3bc512a75922 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt STDARG 3
diff --git a/share/man/man3/sysexits.3 b/share/man/man3/sysexits.3
index 81259e30c839..ba2e0608248c 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.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .\" "
 .Dd March 31, 1996
diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4
index 84e6d17b6e3b..1c9c1514ef1f 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.
 .\"
-.\"	$Id: adv.4,v 1.1 1998/10/16 21:12:07 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 16, 1998
 .Dt ADV 4 i386
diff --git a/share/man/man4/adw.4 b/share/man/man4/adw.4
index db370ca8e889..9cc50d46d4c1 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.
 .\"
-.\"	$Id: adw.4,v 1.1 1998/10/16 21:12:07 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 16, 1998
 .Dt ADW 4 i386
diff --git a/share/man/man4/aha.4 b/share/man/man4/aha.4
index 2eb64e4b8c5a..0d49eb7503d1 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.
 .\"
-.\"	$Id: aha.4,v 1.7 1998/10/16 04:41:38 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt AHA 4 i386
diff --git a/share/man/man4/ahb.4 b/share/man/man4/ahb.4
index 1f6c19ae999a..a0fced45c7c2 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.
 .\"
-.\"	$Id: ahb.4,v 1.9 1998/10/16 04:41:38 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt AHB 4 i386
diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index 097537199bec..07f554b382f8 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.
 .\"
-.\"	$Id: ahc.4,v 1.16 1999/07/30 12:59:13 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt AHC 4 i386
diff --git a/share/man/man4/al.4 b/share/man/man4/al.4
index 71f83a8e4a58..3048d572c1d7 100644
--- a/share/man/man4/al.4
+++ b/share/man/man4/al.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.
 .\"
-.\"	$Id: al.4,v 1.2 1999/05/21 14:59:48 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 20, 1999
 .Dt AL 4 i386
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index 7231bd17bf5e..026a40093c16 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.
 .\"
-.\" $Id: atkbd.4,v 1.7 1999/07/30 14:12:12 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 21, 1999
 .Dt ATKBD 4
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 9278bd73ba5f..ed3d6de2fb0d 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.
 .\"
-.\" $Id: atkbdc.4,v 1.2 1999/02/10 14:25:03 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 9, 1999
 .Dt ATKBDC 4
diff --git a/share/man/man4/ax.4 b/share/man/man4/ax.4
index 5eda3f62a983..c78796c69c67 100644
--- a/share/man/man4/ax.4
+++ b/share/man/man4/ax.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.
 .\"
-.\"	$Id: ax.4,v 1.5 1999/05/21 14:59:47 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 2, 1999
 .Dt AX 4 i386
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 1a9873d45971..bffe57828420 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: bktr.4,v 1.2 1998/11/04 22:13:35 nsouch Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 28, 1998
 .Dt BKTR 4 i386
diff --git a/share/man/man4/blackhole.4 b/share/man/man4/blackhole.4
index 741603d15345..57ca13296702 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.
 .\"
 .\"
-.\" $Id: blackhole.4,v 1.1 1999/08/17 13:46:38 csgr Exp $
+.\" $FreeBSD$
 .Dd August 17, 1999
 .Dt BLACKHOLE 4
 .Os FreeBSD 
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 0ca49ae830e0..27dc243477b0 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.
 .\"
-.\"	$Id: bpf.4,v 1.16 1999/01/10 04:59:59 danny Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 16, 1996
 .Dt BPF 4
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index c9aef83a5619..564450cd33dd 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,5 +1,5 @@
 .\"
-.\"     $Id: bridge.4,v 1.3 1999/02/25 10:48:31 kato Exp $
+.\" $FreeBSD$
 .\"
 .Dd Sep 28, 1998
 .Dt BRIDGE 4
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index f3d6bc2d69b3..d4b4c2c1671f 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.
 .\"
-.\"	$Id: bt.4,v 1.6 1998/10/16 21:33:34 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 16, 1998
 .Dt BT 4 i386
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 79a07e498c9b..0bdc7904eb98 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd August 9, 1995
 .Dt CCD 4
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index cbb50850e1c8..a3b354fa24ab 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.
 .\"
-.\"	$Id: cd.4,v 1.14 1999/05/08 21:28:12 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 10, 1998
 .Dt CD 4
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 37b1560fcf80..de958eac69e4 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -1,4 +1,4 @@
-.\"	$Id: ch.4,v 1.14 1999/05/08 21:28:13 ken Exp $
+.\" $FreeBSD$
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
 .\"
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index d51cd4334d57..2f3cdf54c664 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 $
-.\"	$Id: cy.4,v 1.10 1999/05/20 09:55:53 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 14, 1999
 .Dt CY 4 i386
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index e788e16d2351..7ddb4d3c24c0 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.
 .\"
-.\"	$Id: da.4,v 1.18 1999/08/09 14:31:04 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt DA 4
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index ded8fd088027..a4648e5cec1a 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -57,7 +57,7 @@
 .\" 	Created.
 .\" 	[90/08/30            dbg]
 .\" 
-.\" $Id: ddb.4,v 1.5 1997/02/22 13:24:26 peter Exp $
+.\" $FreeBSD$
 .Dd January 16, 1996
 .Dt DDB 4
 .Os FreeBSD
diff --git a/share/man/man4/de.4 b/share/man/man4/de.4
index 1f06693728e9..938d09fff693 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.
 .\"
-.\" $Id: de.4,v 1.4 1997/10/12 02:20:54 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt DE 4 i386
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index 82b292ebe70d..f82b19e427c8 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -1,4 +1,4 @@
-.\"	$Id: divert.4,v 1.11 1998/05/25 08:44:28 julian Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 18, 1996
 .Dt DIVERT 4
diff --git a/share/man/man4/dpt.4 b/share/man/man4/dpt.4
index 8268562c8e93..87415860d75c 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.
 .\"
-.\"	$Id: dpt.4,v 1.1 1998/10/16 22:00:55 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 16, 1998
 .Dt DPT 4 i386
diff --git a/share/man/man4/drum.4 b/share/man/man4/drum.4
index cb5647d1e7b8..ea3cf912bc5d 100644
--- a/share/man/man4/drum.4
+++ b/share/man/man4/drum.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)drum.4	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt DRUM 4
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index caefdefe035e..62b89d5c039c 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -1,5 +1,5 @@
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd Sep 28, 1998
 .Dt DUMMYNET 4
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 3089d819d213..62756c8867c5 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.
 .\"
-.\"	$Id: ed.4,v 1.14 1999/05/04 21:04:01 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 28, 1995
 .Dt ED 4 i386
diff --git a/share/man/man4/fd.4 b/share/man/man4/fd.4
index 9f4cd069e667..671eb8b3cd86 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt FD 4
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index ab1addfb1979..bae8e04f82fd 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.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.
 .\"
-.\"	$Id: fdc.4,v 1.11 1998/12/27 13:40:51 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 31, 1994
 .Dt FDC 4 i386
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index 33fb47df4c58..51656cc49b3a 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.
 .\"
-.\"	$Id: fpa.4,v 1.9 1997/03/21 20:13:25 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 13, 1995
 .Dt FPA 4 i386
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index 0b1510ba6331..fcf673cc1fdc 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.
 .\"
-.\" $Id: fxp.4,v 1.6 1998/03/12 07:30:32 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt FXP 4 i386
diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4
index e00522759f67..51c3bab6a303 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
-.\"	$Id: icmp.4,v 1.5 1997/02/22 13:24:30 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt ICMP 4
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index 5efddb3e2038..ca80a1006005 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.
 .\"
-.\"	$Id: ifmib.4,v 1.6 1997/02/22 13:24:31 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 15, 1996
 .Dt IFMIB 4
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index e175cd723d8c..7d62ecb6f618 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: iic.4,v 1.2 1999/07/12 21:01:47 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 25, 1998
 .Dt IIC 4
diff --git a/share/man/man4/iicbb.4 b/share/man/man4/iicbb.4
index b2c0f0d2aacb..1bf49d091bde 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.
 .\"
-.\"     $Id: iicbb.4,v 1.2 1999/07/12 21:01:48 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 25, 1998
 .Dt IICBB 4
diff --git a/share/man/man4/iicbus.4 b/share/man/man4/iicbus.4
index efc974593fc6..8f98bfd722cb 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.
 .\"
-.\"     $Id: iicbus.4,v 1.2 1999/07/12 21:01:49 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 6, 1998
 .Dt IICBUS 4
diff --git a/share/man/man4/iicsmb.4 b/share/man/man4/iicsmb.4
index 4d2f20c46e63..f26c6f26cd00 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.
 .\"
-.\"     $Id: iicsmb.4,v 1.2 1999/07/12 21:01:49 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 10, 1998
 .Dt IICSMB 4
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index 47ab29a46e62..b4bc113a59ab 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
-.\"	$Id: inet.4,v 1.8 1997/02/22 13:24:32 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 14, 1995
 .Dt INET 4
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index 4a17e4ea252d..0b973b7b34b9 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.
 .\"
-.\"	$Id: intpm.4,v 1.2 1999/02/13 18:08:35 nsouch Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/man/man4/intro.4 b/share/man/man4/intro.4
index c69fde0bc893..d933fea9e830 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.
 .\"
-.\" $Id: intro.4,v 1.11 1998/11/30 17:52:45 rnordier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 20, 1996
 .Dt INTRO 4
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index 8a9febea0998..ed8a2bcd9d9b 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
-.\"	$Id: ip.4,v 1.10 1999/03/15 00:14:16 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 30, 1993
 .Dt IP 4
diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4
index 524a17ebcf21..d49f853355b1 100644
--- a/share/man/man4/ipfirewall.4
+++ b/share/man/man4/ipfirewall.4
@@ -1,5 +1,5 @@
 .\"
-.\"     $Id: ipfirewall.4,v 1.12 1997/09/29 10:10:15 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 22, 1997
 .Dt IPFIREWALL 4
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index c262870e6596..039542c1b7a5 100644
--- a/share/man/man4/joy.4
+++ b/share/man/man4/joy.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: joy.4,v 1.9 1998/03/12 07:30:33 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 23, 1995
 .Dt JOY 4 i386
diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index f9809c92860b..575936bd1b11 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: keyboard.4,v 1.15 1998/06/29 06:56:40 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 8, 1995
 .Dt KEYBOARD 4 i386
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index 0a157dbd04a8..308d7b6bed43 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.
 .\"
-.\"     $Id: kld.4,v 1.2 1999/04/13 14:51:51 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 08, 1998
 .Dt KLD 4
diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4
index 101912383a27..32e2508500fb 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
-.\"	$Id: lo.4,v 1.5 1997/02/22 13:24:37 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt LO 4
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index f8be0f6400ce..dba34cea8a0f 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 4, 1996
 .Os
diff --git a/share/man/man4/lpbb.4 b/share/man/man4/lpbb.4
index 6130cfbd1ef3..406409b4b9df 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.
 .\"
-.\"     $Id: lpbb.4,v 1.3 1999/07/12 21:01:50 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 25, 1998
 .Dt LPBB 4
diff --git a/share/man/man4/lpt.4 b/share/man/man4/lpt.4
index 28d171000261..462e01075025 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 14, 1999
 .Dt LPT 4
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index fd1726e72a02..5e115216a4da 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.112 1999/07/27 06:52:46 bde Exp $
+# $FreeBSD$
 
 MAN4=	adv.4 adw.4 aha.4 ahb.4 ahc.4 aic.4 al.4 alpm.4 apm.4 ar.4 asc.4 \
 	atkbd.4 atkbdc.4 ax.4 bktr.4 bt.4 cs.4 cx.4 cy.4 de.4 \
diff --git a/share/man/man4/man4.i386/adv.4 b/share/man/man4/man4.i386/adv.4
index 84e6d17b6e3b..1c9c1514ef1f 100644
--- a/share/man/man4/man4.i386/adv.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: adv.4,v 1.1 1998/10/16 21:12:07 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 16, 1998
 .Dt ADV 4 i386
diff --git a/share/man/man4/man4.i386/adw.4 b/share/man/man4/man4.i386/adw.4
index db370ca8e889..9cc50d46d4c1 100644
--- a/share/man/man4/man4.i386/adw.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: adw.4,v 1.1 1998/10/16 21:12:07 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 16, 1998
 .Dt ADW 4 i386
diff --git a/share/man/man4/man4.i386/aha.4 b/share/man/man4/man4.i386/aha.4
index 2eb64e4b8c5a..0d49eb7503d1 100644
--- a/share/man/man4/man4.i386/aha.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: aha.4,v 1.7 1998/10/16 04:41:38 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt AHA 4 i386
diff --git a/share/man/man4/man4.i386/ahb.4 b/share/man/man4/man4.i386/ahb.4
index 1f6c19ae999a..a0fced45c7c2 100644
--- a/share/man/man4/man4.i386/ahb.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: ahb.4,v 1.9 1998/10/16 04:41:38 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt AHB 4 i386
diff --git a/share/man/man4/man4.i386/ahc.4 b/share/man/man4/man4.i386/ahc.4
index 097537199bec..07f554b382f8 100644
--- a/share/man/man4/man4.i386/ahc.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: ahc.4,v 1.16 1999/07/30 12:59:13 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt AHC 4 i386
diff --git a/share/man/man4/man4.i386/aic.4 b/share/man/man4/man4.i386/aic.4
index 9101008ddc12..9e9bd2afe330 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.
 .\"
-.\"	$Id: aic.4,v 1.4 1997/02/22 13:25:10 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 29, 1994
 .Dt AIC 4 i386
diff --git a/share/man/man4/man4.i386/al.4 b/share/man/man4/man4.i386/al.4
index 71f83a8e4a58..3048d572c1d7 100644
--- a/share/man/man4/man4.i386/al.4
+++ b/share/man/man4/man4.i386/al.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.
 .\"
-.\"	$Id: al.4,v 1.2 1999/05/21 14:59:48 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 20, 1999
 .Dt AL 4 i386
diff --git a/share/man/man4/man4.i386/alpm.4 b/share/man/man4/man4.i386/alpm.4
index b5f3cacb787f..3c5621bd0f10 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.
 .\"
-.\"	$Id: alpm.4,v 1.1 1999/02/13 17:48:41 nsouch Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index d76268df1e50..54cb1bad1016 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.
 .\"
-.\"	$Id: apm.4,v 1.9 1998/12/18 03:08:57 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .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 2fc43369bb14..3dbc33e5578d 100644
--- a/share/man/man4/man4.i386/ar.4
+++ b/share/man/man4/man4.i386/ar.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ar.4,v 1.10 1999/05/20 09:55:50 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 19, 1995
 .Dt AR 4 i386
diff --git a/share/man/man4/man4.i386/asc.4 b/share/man/man4/man4.i386/asc.4
index c573a22d6d0b..245d59ee44bf 100644
--- a/share/man/man4/man4.i386/asc.4
+++ b/share/man/man4/man4.i386/asc.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.
 .\"
-.\"	$Id: asc.4,v 1.9 1999/05/20 09:55:50 yokota Exp $
+.\" $FreeBSD$
 .Dd January 19, 1995
 .Dt ASC 4 i386
 .Os FreeBSD
diff --git a/share/man/man4/man4.i386/atkbd.4 b/share/man/man4/man4.i386/atkbd.4
index 7231bd17bf5e..026a40093c16 100644
--- a/share/man/man4/man4.i386/atkbd.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: atkbd.4,v 1.7 1999/07/30 14:12:12 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 21, 1999
 .Dt ATKBD 4
diff --git a/share/man/man4/man4.i386/atkbdc.4 b/share/man/man4/man4.i386/atkbdc.4
index 9278bd73ba5f..ed3d6de2fb0d 100644
--- a/share/man/man4/man4.i386/atkbdc.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: atkbdc.4,v 1.2 1999/02/10 14:25:03 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 9, 1999
 .Dt ATKBDC 4
diff --git a/share/man/man4/man4.i386/ax.4 b/share/man/man4/man4.i386/ax.4
index 5eda3f62a983..c78796c69c67 100644
--- a/share/man/man4/man4.i386/ax.4
+++ b/share/man/man4/man4.i386/ax.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.
 .\"
-.\"	$Id: ax.4,v 1.5 1999/05/21 14:59:47 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 2, 1999
 .Dt AX 4 i386
diff --git a/share/man/man4/man4.i386/bktr.4 b/share/man/man4/man4.i386/bktr.4
index 1a9873d45971..bffe57828420 100644
--- a/share/man/man4/man4.i386/bktr.4
+++ b/share/man/man4/man4.i386/bktr.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: bktr.4,v 1.2 1998/11/04 22:13:35 nsouch Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 28, 1998
 .Dt BKTR 4 i386
diff --git a/share/man/man4/man4.i386/bt.4 b/share/man/man4/man4.i386/bt.4
index f3d6bc2d69b3..d4b4c2c1671f 100644
--- a/share/man/man4/man4.i386/bt.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: bt.4,v 1.6 1998/10/16 21:33:34 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 16, 1998
 .Dt BT 4 i386
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index 7ad2507bef7e..e7c4047122d6 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.
 .\"
-.\"	$Id: cs.4,v 1.2 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 20, 1998
 .Dt CS 4 i386
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index 0730d99d2a4e..4912e0ce3d75 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: cx.4,v 1.5 1999/08/14 20:51:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 12, 1994
 .Dt CX 4 i386
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4
index d51cd4334d57..2f3cdf54c664 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/man4.i386/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 $
-.\"	$Id: cy.4,v 1.10 1999/05/20 09:55:53 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 14, 1999
 .Dt CY 4 i386
diff --git a/share/man/man4/man4.i386/de.4 b/share/man/man4/man4.i386/de.4
index 1f06693728e9..938d09fff693 100644
--- a/share/man/man4/man4.i386/de.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: de.4,v 1.4 1997/10/12 02:20:54 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt DE 4 i386
diff --git a/share/man/man4/man4.i386/dgb.4 b/share/man/man4/man4.i386/dgb.4
index ad6898390e5e..de5d94d98fc2 100644
--- a/share/man/man4/man4.i386/dgb.4
+++ b/share/man/man4/man4.i386/dgb.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
-.\"	$Id: dgb.4,v 1.8 1999/05/20 09:55:55 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd Oct 13, 1995
 .Dt DGB 4 i386
diff --git a/share/man/man4/man4.i386/dpt.4 b/share/man/man4/man4.i386/dpt.4
index 8268562c8e93..87415860d75c 100644
--- a/share/man/man4/man4.i386/dpt.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: dpt.4,v 1.1 1998/10/16 22:00:55 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 16, 1998
 .Dt DPT 4 i386
diff --git a/share/man/man4/man4.i386/ed.4 b/share/man/man4/man4.i386/ed.4
index 3089d819d213..62756c8867c5 100644
--- a/share/man/man4/man4.i386/ed.4
+++ b/share/man/man4/man4.i386/ed.4
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ed.4,v 1.14 1999/05/04 21:04:01 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 28, 1995
 .Dt ED 4 i386
diff --git a/share/man/man4/man4.i386/el.4 b/share/man/man4/man4.i386/el.4
index 7dad5d7af379..830150b2269c 100644
--- a/share/man/man4/man4.i386/el.4
+++ b/share/man/man4/man4.i386/el.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.
 .\"
-.\"	$Id: el.4,v 1.7 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 10, 1995
 .Dt EL 4 i386
diff --git a/share/man/man4/man4.i386/ep.4 b/share/man/man4/man4.i386/ep.4
index 4fecfee0aff9..f6dd3a72d258 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.
 .\"
-.\"	$Id: ep.4,v 1.9 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 04, 1993
 .Dt EP 4 i386
diff --git a/share/man/man4/man4.i386/ex.4 b/share/man/man4/man4.i386/ex.4
index 1a66e4eb06ea..7a07f070371d 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.
 .\"
-.\" $Id: ex.4,v 1.6 1998/10/22 14:32:20 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt EX 4 i386
diff --git a/share/man/man4/man4.i386/fdc.4 b/share/man/man4/man4.i386/fdc.4
index ab1addfb1979..bae8e04f82fd 100644
--- a/share/man/man4/man4.i386/fdc.4
+++ b/share/man/man4/man4.i386/fdc.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.
 .\"
-.\"	$Id: fdc.4,v 1.11 1998/12/27 13:40:51 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 31, 1994
 .Dt FDC 4 i386
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 91ff995c4c26..a40b17f4a63d 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.
 .\"
-.\"	$Id: fe.4,v 1.11 1998/10/22 13:01:19 bde Exp $
+.\" $FreeBSD$
 .Dd March 3, 1996
 .Dt FE 4 i386
 .Sh NAME
diff --git a/share/man/man4/man4.i386/fxp.4 b/share/man/man4/man4.i386/fxp.4
index 0b1510ba6331..fcf673cc1fdc 100644
--- a/share/man/man4/man4.i386/fxp.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: fxp.4,v 1.6 1998/03/12 07:30:32 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt FXP 4 i386
diff --git a/share/man/man4/man4.i386/gsc.4 b/share/man/man4/man4.i386/gsc.4
index 51a70bd490d0..15daf92fdac9 100644
--- a/share/man/man4/man4.i386/gsc.4
+++ b/share/man/man4/man4.i386/gsc.4
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: gsc.4,v 1.8 1998/03/12 07:30:33 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 9, 1995
 .Os FreeBSD
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index 317b654bacb9..e6ed8e206036 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -2,7 +2,7 @@
 .\" Copyright (c) 1994, Wilko Bulte
 .\" All rights reserved.
 .\"
-.\"	$Id: ie.4,v 1.7 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 23, 1994
 .Dt IE 4 i386
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/man4.i386/io.4
index 798e2b66f550..904fc778240e 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.
 .\"
-.\" $Id: io.4,v 1.4 1997/02/22 13:25:31 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd Jan 1, 1996
 .Dt IO 4 i386
diff --git a/share/man/man4/man4.i386/joy.4 b/share/man/man4/man4.i386/joy.4
index c262870e6596..039542c1b7a5 100644
--- a/share/man/man4/man4.i386/joy.4
+++ b/share/man/man4/man4.i386/joy.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: joy.4,v 1.9 1998/03/12 07:30:33 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 23, 1995
 .Dt JOY 4 i386
diff --git a/share/man/man4/man4.i386/keyboard.4 b/share/man/man4/man4.i386/keyboard.4
index f9809c92860b..575936bd1b11 100644
--- a/share/man/man4/man4.i386/keyboard.4
+++ b/share/man/man4/man4.i386/keyboard.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: keyboard.4,v 1.15 1998/06/29 06:56:40 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 8, 1995
 .Dt KEYBOARD 4 i386
diff --git a/share/man/man4/man4.i386/labpc.4 b/share/man/man4/man4.i386/labpc.4
index 375948060013..56cf0d0b03d7 100644
--- a/share/man/man4/man4.i386/labpc.4
+++ b/share/man/man4/man4.i386/labpc.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.
 .\"
-.\"	$Id: labpc.4,v 1.6 1998/10/22 14:51:19 bde Exp $
+.\" $FreeBSD$
 .\"
 .rm ES
 .rm EE
diff --git a/share/man/man4/man4.i386/le.4 b/share/man/man4/man4.i386/le.4
index 0f3f050bd797..73de62308184 100644
--- a/share/man/man4/man4.i386/le.4
+++ b/share/man/man4/man4.i386/le.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.
 .\"
-.\" $Id: le.4,v 1.5 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt LE 4 i386
diff --git a/share/man/man4/man4.i386/lnc.4 b/share/man/man4/man4.i386/lnc.4
index 6bd1c4da0583..b7f87cc36cd2 100644
--- a/share/man/man4/man4.i386/lnc.4
+++ b/share/man/man4/man4.i386/lnc.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.
 .\"
-.\" $Id: lnc.4,v 1.8 1999/08/10 01:03:42 mdodd Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt LNC 4 i386
diff --git a/share/man/man4/man4.i386/matcd.4 b/share/man/man4/man4.i386/matcd.4
index e32cfe95dfc8..c0cdeea0a712 100644
--- a/share/man/man4/man4.i386/matcd.4
+++ b/share/man/man4/man4.i386/matcd.4
@@ -81,7 +81,7 @@
 .\"<3>	Text brought in sync with changes made in versions 1(22) - 1(25)
 .\"	Frank Durda IV  24-Sep-95
 .\"
-.\"	$Id: matcd.4,v 1.9 1997/06/23 04:51:57 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 24, 1995
 .Dt MATCD 4 i386
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 9fcd4ea38631..42f49539f829 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.
 .\"
-.\"	$Id: mcd.4,v 1.7 1999/02/13 21:45:58 fenner Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 8, 1994
 .Dt MCD 4 i386
diff --git a/share/man/man4/man4.i386/mem.4 b/share/man/man4/man4.i386/mem.4
index 4cf78a5913d7..58d019cea00a 100644
--- a/share/man/man4/man4.i386/mem.4
+++ b/share/man/man4/man4.i386/mem.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mem.4	5.3 (Berkeley) 5/2/91
-.\"	$Id: mem.4,v 1.3 1997/03/07 02:49:51 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt MEM 4 i386
diff --git a/share/man/man4/man4.i386/meteor.4 b/share/man/man4/man4.i386/meteor.4
index 557d7535f2e9..1e75294d6672 100644
--- a/share/man/man4/man4.i386/meteor.4
+++ b/share/man/man4/man4.i386/meteor.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: meteor.4,v 1.7 1998/06/08 06:11:59 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 15, 1995
 .br
diff --git a/share/man/man4/man4.i386/mouse.4 b/share/man/man4/man4.i386/mouse.4
index f6ed3527923c..5768236dd5ba 100644
--- a/share/man/man4/man4.i386/mouse.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: mouse.4,v 1.2 1998/03/12 07:30:35 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1997
 .Dt MOUSE 4 i386
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index bc6ab6ab5c2d..0b3e70aaba98 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.
 .\"
-.\"	$Id: mse.4,v 1.5 1998/10/22 14:51:19 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1997
 .Dt MSE 4 i386
diff --git a/share/man/man4/man4.i386/mtio.4 b/share/man/man4/man4.i386/mtio.4
index ea4813a1adf4..2c8f795b0393 100644
--- a/share/man/man4/man4.i386/mtio.4
+++ b/share/man/man4/man4.i386/mtio.4
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mtio.4	8.1 (Berkeley) 6/5/93
-.\"	$Id: mtio.4,v 1.3 1997/03/07 02:49:54 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 11, 1996
 .Dt MTIO 4 i386
diff --git a/share/man/man4/man4.i386/mx.4 b/share/man/man4/man4.i386/mx.4
index 3c9b44cd5b2a..6a960416b76f 100644
--- a/share/man/man4/man4.i386/mx.4
+++ b/share/man/man4/man4.i386/mx.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.
 .\"
-.\"	$Id: mx.4,v 1.4 1999/05/28 18:43:19 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 5, 1998
 .Dt MX 4 i386
diff --git a/share/man/man4/man4.i386/ncr.4 b/share/man/man4/man4.i386/ncr.4
index 48e5359fe133..789feb8cac44 100644
--- a/share/man/man4/man4.i386/ncr.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: ncr.4,v 1.6 1999/05/05 04:01:40 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 10, 1996
 .Dt NCR 4 i386
diff --git a/share/man/man4/man4.i386/npx.4 b/share/man/man4/man4.i386/npx.4
index 4fb1f7656f20..0fbdafe56e72 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.
 .\"
 .\"	from: npx.4,v 1.1 1993/08/06 10:58:03 cgd Exp
-.\"	$Id: npx.4,v 1.5 1998/10/22 14:22:13 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 28, 1993
 .Dt NPX 4 i386
diff --git a/share/man/man4/man4.i386/ohci.4 b/share/man/man4/man4.i386/ohci.4
index 5158d9173eef..41f875495ff2 100644
--- a/share/man/man4/man4.i386/ohci.4
+++ b/share/man/man4/man4.i386/ohci.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.
 .\"
-.\"	$Id: ohci.4,v 1.1 1999/02/21 16:56:33 n_hibma Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 21, 1999
 .Dt 0HCI 4 i386
diff --git a/share/man/man4/man4.i386/pcf.4 b/share/man/man4/man4.i386/pcf.4
index 3e6e85dfe5e7..060d9a75e17f 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.
 .\"
-.\"     $Id: pcf.4,v 1.3 1999/07/12 21:01:55 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 6, 1998
 .Dt PCF 4
diff --git a/share/man/man4/man4.i386/pcm.4 b/share/man/man4/man4.i386/pcm.4
index f8b7e095ede7..dcc2c41be914 100644
--- a/share/man/man4/man4.i386/pcm.4
+++ b/share/man/man4/man4.i386/pcm.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pcm.4,v 1.4 1999/05/20 09:56:06 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 3, 1998
 .Dt PCM 4 i386
diff --git a/share/man/man4/man4.i386/pcvt.4 b/share/man/man4/man4.i386/pcvt.4
index 568a1640bfcc..31594151dcad 100644
--- a/share/man/man4/man4.i386/pcvt.4
+++ b/share/man/man4/man4.i386/pcvt.4
@@ -31,7 +31,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)pcvt.4, 3.20, Last Edit-Date: [Sun Apr  2 18:23:39 1995]
-.\"	$Id: pcvt.4,v 1.15 1999/02/07 05:40:14 yokota Exp $
+.\" $FreeBSD$
 .\"
 .\" Man page pcvt(4) created after pcvt_ioctl.h on 13-Jan-93
 .\" by Joerg Wunsch
diff --git a/share/man/man4/man4.i386/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index 58d94542d5b9..794d009ccb0d 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.
 .\"
-.\"	$Id: perfmon.4,v 1.5 1997/02/22 13:25:38 peter Exp $
+.\" $FreeBSD$
 .Dd March 26, 1996
 .Dt PERFMON 4 i386
 .Os FreeBSD 2.2
diff --git a/share/man/man4/man4.i386/pn.4 b/share/man/man4/man4.i386/pn.4
index cf6107fb0dc0..57847797b612 100644
--- a/share/man/man4/man4.i386/pn.4
+++ b/share/man/man4/man4.i386/pn.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.
 .\"
-.\"	$Id: pn.4,v 1.5 1999/05/05 07:36:58 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 7, 1998
 .Dt PN 4 i386
diff --git a/share/man/man4/man4.i386/pnp.4 b/share/man/man4/man4.i386/pnp.4
index 764fbaa2acf1..df9adec6a9c3 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: pnp.4,v 1.2 1998/03/12 07:30:36 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 7, 1997
 .Dt PNP 4 i386
diff --git a/share/man/man4/man4.i386/ppc.4 b/share/man/man4/man4.i386/ppc.4
index 72256d957cf5..2b6122202f0f 100644
--- a/share/man/man4/man4.i386/ppc.4
+++ b/share/man/man4/man4.i386/ppc.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: ppc.4,v 1.5 1999/08/15 10:48:11 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 5, 1998
 .Dt PPC 4
diff --git a/share/man/man4/man4.i386/psm.4 b/share/man/man4/man4.i386/psm.4
index 81811f5c9460..0312c519e819 100644
--- a/share/man/man4/man4.i386/psm.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: psm.4,v 1.17 1999/08/14 20:51:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 30, 1999
 .Dt PSM 4 i386
diff --git a/share/man/man4/man4.i386/rdp.4 b/share/man/man4/man4.i386/rdp.4
index 94619046429a..cf08d295445d 100644
--- a/share/man/man4/man4.i386/rdp.4
+++ b/share/man/man4/man4.i386/rdp.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.
 .\"
-.\" $Id: rdp.4,v 1.2 1999/02/10 02:45:06 des Exp $
+.\" $FreeBSD$
 .\"
 .\"
 .\" " (emacs disconfusion)
diff --git a/share/man/man4/man4.i386/rl.4 b/share/man/man4/man4.i386/rl.4
index a158cf7501b9..84c9b91c11e5 100644
--- a/share/man/man4/man4.i386/rl.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: rl.4,v 1.8 1999/03/25 00:52:44 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 4, 1998
 .Dt RL 4 i386
diff --git a/share/man/man4/man4.i386/sb.4 b/share/man/man4/man4.i386/sb.4
index 9fef070a8325..736f13321500 100644
--- a/share/man/man4/man4.i386/sb.4
+++ b/share/man/man4/man4.i386/sb.4
@@ -10,7 +10,7 @@
 .\" Creative Labs, not me.
 .\" 
 .\" alex!@bigfoot.com
-.\"     $Id: sb.4,v 1.5 1999/07/12 21:01:56 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 9, 1997
 .Dt SB 4 i386
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index 8b2e627fe5e8..c7c6269a5a73 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.
 .\"
-.\"	$Id: scd.4,v 1.7 1999/02/18 16:53:29 fenner Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 1, 1995
 .Dt SCD 4 i386
diff --git a/share/man/man4/man4.i386/screen.4 b/share/man/man4/man4.i386/screen.4
index 585a7f1c598d..be40d4fcb03d 100644
--- a/share/man/man4/man4.i386/screen.4
+++ b/share/man/man4/man4.i386/screen.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: screen.4,v 1.10 1998/06/08 06:11:59 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 8, 1995
 .Dt SCREEN 4 i386
diff --git a/share/man/man4/man4.i386/sf.4 b/share/man/man4/man4.i386/sf.4
index d13937a4d1fd..97629e0b035e 100644
--- a/share/man/man4/man4.i386/sf.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: sf.4,v 1.1 1999/07/25 04:32:40 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 22, 1999
 .Dt SF 4 i386
diff --git a/share/man/man4/man4.i386/si.4 b/share/man/man4/man4.i386/si.4
index 1fa99f24e479..a4648c785069 100644
--- a/share/man/man4/man4.i386/si.4
+++ b/share/man/man4/man4.i386/si.4
@@ -1,4 +1,4 @@
-.\" $Id: si.4,v 1.14 1999/05/20 09:56:10 yokota Exp $
+.\" $FreeBSD$
 .\" The following requests are required for all man pages.
 .Dd September 16, 1995
 .Os FreeBSD
diff --git a/share/man/man4/man4.i386/sio.4 b/share/man/man4/man4.i386/sio.4
index 44c5850178fd..a3ddc6ed6843 100644
--- a/share/man/man4/man4.i386/sio.4
+++ b/share/man/man4/man4.i386/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
-.\"	$Id: sio.4,v 1.28 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 10, 1995
 .Dt SIO 4 i386
diff --git a/share/man/man4/man4.i386/sk.4 b/share/man/man4/man4.i386/sk.4
index e0c911779506..5fc826e6f34c 100644
--- a/share/man/man4/man4.i386/sk.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: sk.4,v 1.1 1999/07/09 04:30:04 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 3, 1999
 .Dt SK 4 i386
diff --git a/share/man/man4/man4.i386/spkr.4 b/share/man/man4/man4.i386/spkr.4
index ec70bfe02107..9bc1b7e76648 100644
--- a/share/man/man4/man4.i386/spkr.4
+++ b/share/man/man4/man4.i386/spkr.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: spkr.4,v 1.10 1998/03/12 07:30:38 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 7, 1993
 .Dt SPKR 4 i386
diff --git a/share/man/man4/man4.i386/splash.4 b/share/man/man4/man4.i386/splash.4
index c75ebaf0b3d8..03d24c1d7773 100644
--- a/share/man/man4/man4.i386/splash.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: splash.4,v 1.3 1999/04/12 18:56:51 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 9, 1999
 .Dt SPLASH 4 i386
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index c7e04ab20370..56ea34d06ea6 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.
 .\"
-.\" $Id: sr.4,v 1.10 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 4, 1996
 .Dt SR 4 i386
diff --git a/share/man/man4/man4.i386/ste.4 b/share/man/man4/man4.i386/ste.4
index 9b4817d433a7..3da3895c54a4 100644
--- a/share/man/man4/man4.i386/ste.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 21, 1999
 .Dt STE 4 i386
diff --git a/share/man/man4/man4.i386/syscons.4 b/share/man/man4/man4.i386/syscons.4
index 317be2578587..706e8553ec4d 100644
--- a/share/man/man4/man4.i386/syscons.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: syscons.4,v 1.4 1999/08/14 20:51:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1999
 .Dt SYSCONS 4
diff --git a/share/man/man4/man4.i386/sysmouse.4 b/share/man/man4/man4.i386/sysmouse.4
index e9deff31aa14..dca7ad29037f 100644
--- a/share/man/man4/man4.i386/sysmouse.4
+++ b/share/man/man4/man4.i386/sysmouse.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sysmouse.4,v 1.7 1998/03/12 07:30:38 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1997
 .Dt SYSMOUSE 4 i386
diff --git a/share/man/man4/man4.i386/ti.4 b/share/man/man4/man4.i386/ti.4
index 7f2a60939575..b74249001114 100644
--- a/share/man/man4/man4.i386/ti.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: ti.4,v 1.1 1999/04/06 17:08:29 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 4, 1999
 .Dt TI 4 i386
diff --git a/share/man/man4/man4.i386/tl.4 b/share/man/man4/man4.i386/tl.4
index c69f333d4b45..3591a6dab733 100644
--- a/share/man/man4/man4.i386/tl.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: tl.4,v 1.3 1999/01/29 16:25:20 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1998
 .Dt TL 4 i386
diff --git a/share/man/man4/man4.i386/tw.4 b/share/man/man4/man4.i386/tw.4
index bceab456d611..2ead94bc4399 100644
--- a/share/man/man4/man4.i386/tw.4
+++ b/share/man/man4/man4.i386/tw.4
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: tw.4,v 1.7 1997/03/21 20:13:59 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd Oct 30, 1993
 .Dt TW 4 i386
diff --git a/share/man/man4/man4.i386/tx.4 b/share/man/man4/man4.i386/tx.4
index a1fa2af69dba..131761d21577 100644
--- a/share/man/man4/man4.i386/tx.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 28, 1997
 .Dt TX 4 i386
diff --git a/share/man/man4/man4.i386/uhci.4 b/share/man/man4/man4.i386/uhci.4
index 068c5841366c..4d06dc652308 100644
--- a/share/man/man4/man4.i386/uhci.4
+++ b/share/man/man4/man4.i386/uhci.4
@@ -30,7 +30,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: uhci.4,v 1.2 1999/07/12 21:01:57 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 21, 1999
 .Dt UHCI 4 i386
diff --git a/share/man/man4/man4.i386/ukbd.4 b/share/man/man4/man4.i386/ukbd.4
index 8fed8cf6ce9a..b906bda8adce 100644
--- a/share/man/man4/man4.i386/ukbd.4
+++ b/share/man/man4/man4.i386/ukbd.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: ukbd.4,v 1.5 1999/07/12 21:01:57 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 11, 1999
 .Dt UKBD 4 i386
diff --git a/share/man/man4/man4.i386/umass.4 b/share/man/man4/man4.i386/umass.4
index 6168de05849b..49f3434d7cd8 100644
--- a/share/man/man4/man4.i386/umass.4
+++ b/share/man/man4/man4.i386/umass.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: umass.4,v 1.3 1999/08/15 10:48:15 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 3, 1999
 .Dt UMASS 4 i386
diff --git a/share/man/man4/man4.i386/ums.4 b/share/man/man4/man4.i386/ums.4
index 410612d87775..4986d0de3d0c 100644
--- a/share/man/man4/man4.i386/ums.4
+++ b/share/man/man4/man4.i386/ums.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: ums.4,v 1.4 1999/07/12 21:01:58 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 11, 1999
 .Dt UMS 4 i386
diff --git a/share/man/man4/man4.i386/usb.4 b/share/man/man4/man4.i386/usb.4
index 8e5657ed4341..be2d8ba261ce 100644
--- a/share/man/man4/man4.i386/usb.4
+++ b/share/man/man4/man4.i386/usb.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.
 .\"
-.\"	$Id: usb.4,v 1.1 1999/02/21 16:56:33 n_hibma Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 21, 1999
 .Dt USB 4 i386
diff --git a/share/man/man4/man4.i386/vga.4 b/share/man/man4/man4.i386/vga.4
index 36c68262314c..53543d11ca18 100644
--- a/share/man/man4/man4.i386/vga.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\" $Id: vga.4,v 1.2 1999/02/10 14:25:03 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1999
 .Dt VGA 4
diff --git a/share/man/man4/man4.i386/vr.4 b/share/man/man4/man4.i386/vr.4
index 256cc91d4f33..8100bfeccd36 100644
--- a/share/man/man4/man4.i386/vr.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: vr.4,v 1.3 1999/03/25 00:52:44 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 22, 1998
 .Dt VR 4 i386
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index 5b8baec0eb2f..0a695e8b54d9 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.
 .\"
-.\"	$Id: vx.4,v 1.6 1997/03/12 13:51:57 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 15, 1996
 .Dt VX 4 i386
diff --git a/share/man/man4/man4.i386/wb.4 b/share/man/man4/man4.i386/wb.4
index 49c0f1a05b70..df4de1ce03d3 100644
--- a/share/man/man4/man4.i386/wb.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: wb.4,v 1.3 1999/03/25 00:52:44 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 4, 1998
 .Dt WB 4 i386
diff --git a/share/man/man4/man4.i386/wd.4 b/share/man/man4/man4.i386/wd.4
index 71ff1ac54998..8d1fe2439e12 100644
--- a/share/man/man4/man4.i386/wd.4
+++ b/share/man/man4/man4.i386/wd.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.
 .\"
-.\"	$Id: wd.4,v 1.12 1999/05/19 22:08:01 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 31, 1994
 .Dt WD 4 i386
diff --git a/share/man/man4/man4.i386/wfd.4 b/share/man/man4/man4.i386/wfd.4
index 5eece1694049..2589ab4526a8 100644
--- a/share/man/man4/man4.i386/wfd.4
+++ b/share/man/man4/man4.i386/wfd.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.
 .\"
-.\"	$Id: wfd.4,v 1.7 1999/08/14 20:51:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 16, 1998
 .Dt WFD 4
diff --git a/share/man/man4/man4.i386/wi.4 b/share/man/man4/man4.i386/wi.4
index 411328f9ce35..cb1b1bf8f096 100644
--- a/share/man/man4/man4.i386/wi.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: wi.4,v 1.3 1999/05/22 16:12:43 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 21, 1999
 .Dt WI 4 i386
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index 6dc857e97f3d..560e591e0c38 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.
 .\"
-.\" $Id: wl.4,v 1.6 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .Dd July 7, 1997
 .Dt WL 4 i386
 .Os FreeBSD
diff --git a/share/man/man4/man4.i386/wt.4 b/share/man/man4/man4.i386/wt.4
index bf78b2bf4237..c43744a86992 100644
--- a/share/man/man4/man4.i386/wt.4
+++ b/share/man/man4/man4.i386/wt.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.
 .\"
-.\"	$Id: wt.4,v 1.4 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 10, 1995
 .Dt WT 4 i386
diff --git a/share/man/man4/man4.i386/xl.4 b/share/man/man4/man4.i386/xl.4
index 6753949187ec..62a76c709e06 100644
--- a/share/man/man4/man4.i386/xl.4
+++ b/share/man/man4/man4.i386/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.
 .\"
-.\"	$Id: xl.4,v 1.4 1999/03/15 02:49:13 billf Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 16, 1998
 .Dt XL 4 i386
diff --git a/share/man/man4/man4.i386/ze.4 b/share/man/man4/man4.i386/ze.4
index baa39999bfef..b8f58bf73156 100644
--- a/share/man/man4/man4.i386/ze.4
+++ b/share/man/man4/man4.i386/ze.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.
 .\"
-.\" $Id: ze.4,v 1.6 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt ZE 4 i386
diff --git a/share/man/man4/man4.i386/zp.4 b/share/man/man4/man4.i386/zp.4
index eff5d435fee5..49af15bc47bd 100644
--- a/share/man/man4/man4.i386/zp.4
+++ b/share/man/man4/man4.i386/zp.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.
 .\"
-.\" $Id: zp.4,v 1.5 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 19, 1997
 .Dt ZP 4 i386
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 4cf78a5913d7..58d019cea00a 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
-.\"	$Id: mem.4,v 1.3 1997/03/07 02:49:51 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1991
 .Dt MEM 4 i386
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index f6ed3527923c..5768236dd5ba 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.
 .\"
-.\" $Id: mouse.4,v 1.2 1998/03/12 07:30:35 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1997
 .Dt MOUSE 4 i386
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index ea4813a1adf4..2c8f795b0393 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
-.\"	$Id: mtio.4,v 1.3 1997/03/07 02:49:54 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 11, 1996
 .Dt MTIO 4 i386
diff --git a/share/man/man4/mx.4 b/share/man/man4/mx.4
index 3c9b44cd5b2a..6a960416b76f 100644
--- a/share/man/man4/mx.4
+++ b/share/man/man4/mx.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.
 .\"
-.\"	$Id: mx.4,v 1.4 1999/05/28 18:43:19 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 5, 1998
 .Dt MX 4 i386
diff --git a/share/man/man4/ncr.4 b/share/man/man4/ncr.4
index 48e5359fe133..789feb8cac44 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.
 .\"
-.\"	$Id: ncr.4,v 1.6 1999/05/05 04:01:40 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 10, 1996
 .Dt NCR 4 i386
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index 262332085c40..40c641797896 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
-.\"	$Id: netintro.4,v 1.7 1997/02/22 13:24:38 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 30, 1993
 .Dt NETINTRO 4
diff --git a/share/man/man4/null.4 b/share/man/man4/null.4
index c47cb15b39c5..518aab86b7b5 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt NULL 4
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4
index 5158d9173eef..41f875495ff2 100644
--- a/share/man/man4/ohci.4
+++ b/share/man/man4/ohci.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.
 .\"
-.\"	$Id: ohci.4,v 1.1 1999/02/21 16:56:33 n_hibma Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 21, 1999
 .Dt 0HCI 4 i386
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index 9c7b70362c91..affda0d0371d 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.
 .\"
-.\"	$Id: pass.4,v 1.2 1998/10/16 00:26:22 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 10, 1998
 .Dt PASS 4
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index f8b7e095ede7..dcc2c41be914 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.
 .\"
-.\"	$Id: pcm.4,v 1.4 1999/05/20 09:56:06 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 3, 1998
 .Dt PCM 4 i386
diff --git a/share/man/man4/pcvt.4 b/share/man/man4/pcvt.4
index 568a1640bfcc..31594151dcad 100644
--- a/share/man/man4/pcvt.4
+++ b/share/man/man4/pcvt.4
@@ -31,7 +31,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)pcvt.4, 3.20, Last Edit-Date: [Sun Apr  2 18:23:39 1995]
-.\"	$Id: pcvt.4,v 1.15 1999/02/07 05:40:14 yokota Exp $
+.\" $FreeBSD$
 .\"
 .\" Man page pcvt(4) created after pcvt_ioctl.h on 13-Jan-93
 .\" by Joerg Wunsch
diff --git a/share/man/man4/pn.4 b/share/man/man4/pn.4
index cf6107fb0dc0..57847797b612 100644
--- a/share/man/man4/pn.4
+++ b/share/man/man4/pn.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.
 .\"
-.\"	$Id: pn.4,v 1.5 1999/05/05 07:36:58 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 7, 1998
 .Dt PN 4 i386
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index 532ada8d4fed..422b909b9a63 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.
 .\"
-.\"     $Id: ppbus.4,v 1.6 1999/07/12 21:01:51 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 1, 1998
 .Dt PPBUS 4
diff --git a/share/man/man4/ppc.4 b/share/man/man4/ppc.4
index 72256d957cf5..2b6122202f0f 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.
 .\"
-.\"     $Id: ppc.4,v 1.5 1999/08/15 10:48:11 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 5, 1998
 .Dt PPC 4
diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4
index d3d7e28bc11f..ca77e5a26bfb 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 2, 1998
 .Dt PPI 4
diff --git a/share/man/man4/ppp.4 b/share/man/man4/ppp.4
index 5d420783f31c..d33e77eaa7d5 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
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd August 10, 1996
 .Dt PPP 4
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 81811f5c9460..0312c519e819 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.
 .\"
-.\" $Id: psm.4,v 1.17 1999/08/14 20:51:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 30, 1999
 .Dt PSM 4 i386
diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4
index 9a59d08220ee..4cb1830b1734 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.
 .\"
-.\"	$Id: pt.4,v 1.5 1997/03/07 02:49:30 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 2, 1995
 .Dt PT 4
diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4
index 29b0f9ee2f3a..eb1211838081 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
-.\"	$Id: pty.4,v 1.5 1997/03/07 02:49:33 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 30, 1993
 .Dt PTY 4
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index a158cf7501b9..84c9b91c11e5 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.
 .\"
-.\"	$Id: rl.4,v 1.8 1999/03/25 00:52:44 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 4, 1998
 .Dt RL 4 i386
diff --git a/share/man/man4/route.4 b/share/man/man4/route.4
index 323b090bfcf9..cd5dac2936ac 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
-.\"	$Id: route.4,v 1.6 1997/03/19 19:47:39 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 8, 1996
 .Dt ROUTE 4
diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4
index ba5fb0b3b237..a57e5ea8feee 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.
 .\"
-.\"	$Id: sa.4,v 1.17 1999/06/06 23:23:50 mjacob Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1999
 .Dt SA 4
diff --git a/share/man/man4/screen.4 b/share/man/man4/screen.4
index 585a7f1c598d..be40d4fcb03d 100644
--- a/share/man/man4/screen.4
+++ b/share/man/man4/screen.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: screen.4,v 1.10 1998/06/08 06:11:59 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 8, 1995
 .Dt SCREEN 4 i386
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 24714230d512..41a508c43fde 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -1,4 +1,4 @@
-.\"	$Id: scsi.4,v 1.13 1999/07/27 18:21:17 nik Exp $
+.\" $FreeBSD$
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
 .\"
diff --git a/share/man/man4/sd.4 b/share/man/man4/sd.4
index d79812a0754a..cc5a075665d3 100644
--- a/share/man/man4/sd.4
+++ b/share/man/man4/sd.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: sd.4,v 1.11 1997/04/01 04:04:09 jdp Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt SD 4
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index d13937a4d1fd..97629e0b035e 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.
 .\"
-.\"	$Id: sf.4,v 1.1 1999/07/25 04:32:40 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 22, 1999
 .Dt SF 4 i386
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 1fa99f24e479..a4648c785069 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -1,4 +1,4 @@
-.\" $Id: si.4,v 1.14 1999/05/20 09:56:10 yokota Exp $
+.\" $FreeBSD$
 .\" The following requests are required for all man pages.
 .Dd September 16, 1995
 .Os FreeBSD
diff --git a/share/man/man4/sio.4 b/share/man/man4/sio.4
index 44c5850178fd..a3ddc6ed6843 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
-.\"	$Id: sio.4,v 1.28 1998/10/22 14:12:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 10, 1995
 .Dt SIO 4 i386
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index e0c911779506..5fc826e6f34c 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.
 .\"
-.\"	$Id: sk.4,v 1.1 1999/07/09 04:30:04 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 3, 1999
 .Dt SK 4 i386
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
index 9ffaecd8eb3e..b4bb2318f138 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
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd August 10, 1996
 .Dt SL 4
diff --git a/share/man/man4/smb.4 b/share/man/man4/smb.4
index 701dc4c12e39..b042cf9bee42 100644
--- a/share/man/man4/smb.4
+++ b/share/man/man4/smb.4
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: smb.4,v 1.2 1999/07/12 21:01:53 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 25, 1998
 .Dt SMB 4
diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4
index 7195449efbab..ea032b2e90c1 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.
 .\"
-.\"     $Id: smbus.4,v 1.3 1999/07/12 21:01:53 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 10, 1998
 .Dt SMBBUS 4
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index e61bc303a53f..3535d8f6fece 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -20,7 +20,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
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .\" SUCH DAMAGE.
 .Dd August 4, 1997
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index 3934ca081107..082a64989ccb 100644
--- a/share/man/man4/snp.4
+++ b/share/man/man4/snp.4
@@ -1,5 +1,5 @@
 .\"
-.\"  $Id: snp.4,v 1.13 1997/03/21 20:13:26 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 24, 1995
 .Dt SNP 4
diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4
index ec70bfe02107..9bc1b7e76648 100644
--- a/share/man/man4/spkr.4
+++ b/share/man/man4/spkr.4
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: spkr.4,v 1.10 1998/03/12 07:30:38 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 7, 1993
 .Dt SPKR 4 i386
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index c75ebaf0b3d8..03d24c1d7773 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.
 .\"
-.\" $Id: splash.4,v 1.3 1999/04/12 18:56:51 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 9, 1999
 .Dt SPLASH 4 i386
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 81ca7eb97a6f..6e5ae40313fa 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.
 .\"
-.\" $Id: sppp.4,v 1.5 1998/03/12 07:30:18 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 19, 1997
 .Dt SPPP 4
diff --git a/share/man/man4/ssc.4 b/share/man/man4/ssc.4
index fb6a4a7af364..5988c7e87e48 100644
--- a/share/man/man4/ssc.4
+++ b/share/man/man4/ssc.4
@@ -1,4 +1,4 @@
-.\"	$Id: ssc.4,v 1.1 1997/12/29 21:07:10 brian Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
 .\" All rights reserved.
diff --git a/share/man/man4/st.4 b/share/man/man4/st.4
index b57593f17cfd..84418570307b 100644
--- a/share/man/man4/st.4
+++ b/share/man/man4/st.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: st.4,v 1.11 1997/03/07 02:49:34 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 15, 1998
 .Dt ST 4
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 9b4817d433a7..3da3895c54a4 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 21, 1999
 .Dt STE 4 i386
diff --git a/share/man/man4/su.4 b/share/man/man4/su.4
index 74f8ab56a158..276cff1956dc 100644
--- a/share/man/man4/su.4
+++ b/share/man/man4/su.4
@@ -1,4 +1,4 @@
-.\"	$Id: su.4,v 1.10 1997/02/22 13:24:44 peter Exp $
+.\" $FreeBSD$
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
 .\"
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 317be2578587..706e8553ec4d 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.
 .\"
-.\" $Id: syscons.4,v 1.4 1999/08/14 20:51:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1999
 .Dt SYSCONS 4
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index e9deff31aa14..dca7ad29037f 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.
 .\"
-.\"	$Id: sysmouse.4,v 1.7 1998/03/12 07:30:38 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1997
 .Dt SYSMOUSE 4 i386
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index bafb02f548a5..28333fab6854 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
-.\"	$Id: tcp.4,v 1.9 1997/03/19 19:47:40 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 14, 1995
 .Dt TCP 4
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index 655ab931429e..94f57c033315 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
-.\"	$Id: termios.4,v 1.8 1999/02/12 02:12:07 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt TERMIOS 4
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index 7f2a60939575..b74249001114 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.
 .\"
-.\"	$Id: ti.4,v 1.1 1999/04/06 17:08:29 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 4, 1999
 .Dt TI 4 i386
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index c69f333d4b45..3591a6dab733 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.
 .\"
-.\"	$Id: tl.4,v 1.3 1999/01/29 16:25:20 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 1, 1998
 .Dt TL 4 i386
diff --git a/share/man/man4/ttcp.4 b/share/man/man4/ttcp.4
index 7d84c44e0645..6b89b410add1 100644
--- a/share/man/man4/ttcp.4
+++ b/share/man/man4/ttcp.4
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: ttcp.4,v 1.5 1997/02/22 13:24:46 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 18, 1995
 .Dt TTCP 4
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index 9e76e5d93088..367033c62307 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 14, 1992
 .Dt TTY 4
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 965537f680ac..97b579fc964b 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 $
-.\" $Id: tun.4,v 1.4 1998/03/12 07:30:18 charnier Exp $
+.\" $FreeBSD$
 .\" Based on PR#2411
 .\"
 .Dd March 10, 1996
diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4
index a1fa2af69dba..131761d21577 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 28, 1997
 .Dt TX 4 i386
diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4
index 1e34c0abc8d6..2bb708529570 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
-.\"	$Id: udp.4,v 1.6 1997/03/19 19:47:43 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt UDP 4
diff --git a/share/man/man4/uhci.4 b/share/man/man4/uhci.4
index 068c5841366c..4d06dc652308 100644
--- a/share/man/man4/uhci.4
+++ b/share/man/man4/uhci.4
@@ -30,7 +30,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: uhci.4,v 1.2 1999/07/12 21:01:57 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 21, 1999
 .Dt UHCI 4 i386
diff --git a/share/man/man4/uk.4 b/share/man/man4/uk.4
index 06860e9408d5..8cb166600cd8 100644
--- a/share/man/man4/uk.4
+++ b/share/man/man4/uk.4
@@ -1,4 +1,4 @@
-.\"	$Id: uk.4,v 1.11 1997/02/22 13:24:52 peter Exp $
+.\" $FreeBSD$
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian@freebsd.org>.  All rights reserved.
 .\"
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index 8fed8cf6ce9a..b906bda8adce 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: ukbd.4,v 1.5 1999/07/12 21:01:57 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 11, 1999
 .Dt UKBD 4 i386
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index 6168de05849b..49f3434d7cd8 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: umass.4,v 1.3 1999/08/15 10:48:15 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 3, 1999
 .Dt UMASS 4 i386
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 410612d87775..4986d0de3d0c 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -29,7 +29,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$FreeBSD$
-.\"     $Id: ums.4,v 1.4 1999/07/12 21:01:58 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 11, 1999
 .Dt UMS 4 i386
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index a69e43aef446..6f5d2c8657d6 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt UNIX 4
diff --git a/share/man/man4/update.4 b/share/man/man4/update.4
index 3da6d9d64379..76eaed1f91f6 100644
--- a/share/man/man4/update.4
+++ b/share/man/man4/update.4
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd February 11, 1996
 .Dt UPDATE 4
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 8e5657ed4341..be2d8ba261ce 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.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.
 .\"
-.\"	$Id: usb.4,v 1.1 1999/02/21 16:56:33 n_hibma Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 21, 1999
 .Dt USB 4 i386
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index 36c68262314c..53543d11ca18 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.
 .\"
-.\" $Id: vga.4,v 1.2 1999/02/10 14:25:03 yokota Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1999
 .Dt VGA 4
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 7635ff5d3b11..c02137023a45 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.
 .\"
-.\" $Id: vinum.4,v 1.19 1999/08/07 09:26:37 grog Exp $
+.\" $FreeBSD$
 .\"
 .Dd 28 March 1999
 .Dt VINUM 4
diff --git a/share/man/man4/vn.4 b/share/man/man4/vn.4
index 40223e2d4834..324cc8f5987f 100644
--- a/share/man/man4/vn.4
+++ b/share/man/man4/vn.4
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1995
 .Dt VN 4
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index fcfa37c32548..6b5e8661e2fd 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.
 .\"
-.\" 	$Id: vpo.4,v 1.3 1999/05/25 17:34:07 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 5, 1998
 .Dt VPO 4
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 256cc91d4f33..8100bfeccd36 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.
 .\"
-.\"	$Id: vr.4,v 1.3 1999/03/25 00:52:44 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 22, 1998
 .Dt VR 4 i386
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 49c0f1a05b70..df4de1ce03d3 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.
 .\"
-.\"	$Id: wb.4,v 1.3 1999/03/25 00:52:44 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 4, 1998
 .Dt WB 4 i386
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index 411328f9ce35..cb1b1bf8f096 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.
 .\"
-.\"	$Id: wi.4,v 1.3 1999/05/22 16:12:43 wpaul Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 21, 1999
 .Dt WI 4 i386
diff --git a/share/man/man4/worm.4 b/share/man/man4/worm.4
index 91cfb1206f1d..e84cedd5bd2d 100644
--- a/share/man/man4/worm.4
+++ b/share/man/man4/worm.4
@@ -32,7 +32,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $Id: worm.4,v 1.16 1998/06/08 06:12:02 jkoshy Exp $
+.\" $FreeBSD$
 .\" "
 .Dd October 15, 1998
 .Dt WORM 4
diff --git a/share/man/man4/wst.4 b/share/man/man4/wst.4
index be146487fd8a..98be65fef37f 100644
--- a/share/man/man4/wst.4
+++ b/share/man/man4/wst.4
@@ -1,4 +1,4 @@
-.\"	$Id: wst.4,v 1.1 1998/10/15 20:43:25 imp Exp $
+.\" $FreeBSD$
 .\" Copyright (c) 1998
 .\"	Warner Losh <imp@village.org>.  All rights reserved.
 .\"
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index 6753949187ec..62a76c709e06 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.
 .\"
-.\"	$Id: xl.4,v 1.4 1999/03/15 02:49:13 billf Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 16, 1998
 .Dt XL 4 i386
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index 0f758912e00b..11afc48f3ea3 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.
 .\"
-.\"	$Id: xpt.4,v 1.1 1998/10/12 00:31:42 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 10, 1998
 .Dt XPT 4
diff --git a/share/man/man4/yp.4 b/share/man/man4/yp.4
index 8dda70484a37..bc268565d29e 100644
--- a/share/man/man4/yp.4
+++ b/share/man/man4/yp.4
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)yp.8	1.0 (deraadt) 4/26/93
-.\"	$Id: yp.4,v 1.14 1997/12/22 07:35:40 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 5, 1993
 .Dt YP 4
diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4
index ea5a8799e957..ba9d617bb450 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 7, 1996
 .Dt ZERO 4
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index 5772dd3b3731..b70666ee150a 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt A.OUT 5
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index ec6f5d71e31d..5af8637174fe 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
-.\"	$Id: acct.5,v 1.4 1997/03/19 19:48:24 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt ACCT 5
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index c3e07e17f157..5937308abe72 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
-.\"	$Id: core.5,v 1.6 1998/05/11 03:41:51 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt CORE 5
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index fc62a929e2d6..734450874c58 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.
 .\"
-.\"	$Id: devfs.5,v 1.4 1998/03/12 07:30:47 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 14, 1996
 .Dt DEVFS 5
diff --git a/share/man/man5/dir.5 b/share/man/man5/dir.5
index 4f9d457e727b..008a7bd3618f 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
-.\"	$Id: dir.5,v 1.9 1998/02/24 02:39:00 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt DIR 5
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index a6bc83bc7dd9..4423b0f487dc 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt DISKTAB 5
diff --git a/share/man/man5/ethers.5 b/share/man/man5/ethers.5
index 8623ef7332ea..ed68dd77bd78 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.
 .\"
-.\"     $Id: ethers.5,v 1.5 1998/01/04 17:34:42 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 5
diff --git a/share/man/man5/fbtab.5 b/share/man/man5/fbtab.5
index c1471b69df21..728e86b605ec 100644
--- a/share/man/man5/fbtab.5
+++ b/share/man/man5/fbtab.5
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: fbtab.5,v 1.3 1997/03/07 03:27:59 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 22, 1994
 .Dt FBTAB 5
diff --git a/share/man/man5/fdesc.5 b/share/man/man5/fdesc.5
index e6c03bcbd6fa..8493398f1635 100644
--- a/share/man/man5/fdesc.5
+++ b/share/man/man5/fdesc.5
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: fdesc.5,v 1.4 1998/03/12 07:30:47 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 14, 1996
 .Dt FDESC 5
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index e6c03bcbd6fa..8493398f1635 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.
 .\"
-.\"	$Id: fdesc.5,v 1.4 1998/03/12 07:30:47 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 14, 1996
 .Dt FDESC 5
diff --git a/share/man/man5/forward.5 b/share/man/man5/forward.5
index c81b4ee1ca56..1088ebabc03d 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.
 .\"
-.\"	$Id: forward.5,v 1.2 1997/03/07 03:28:00 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 2, 1996
 .Dt FORWARD 5
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index 0b36b38b0c4c..0798bdaf3042 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
-.\"	$Id: fs.5,v 1.7 1997/03/19 21:02:11 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt FS 5
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 120d44d06c23..837c4febe16e 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
-.\"	$Id: fstab.5,v 1.9 1998/06/28 21:33:42 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt FSTAB 5
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index b7d9d8138489..fcbb39eebd24 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
-.\"	$Id: group.5,v 1.12 1997/03/12 14:05:28 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 29, 1994
 .Dt GROUP 5
diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5
index e1843726d7b0..00ca8ceccb33 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
-.\"	$Id: hosts.5,v 1.3 1997/03/07 03:28:02 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt HOSTS 5
diff --git a/share/man/man5/hosts.equiv.5 b/share/man/man5/hosts.equiv.5
index 9842ec75dc24..3d74c7f39b7b 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.
 .\"
-.\"	$Id: hosts.equiv.5,v 1.5 1997/02/22 13:26:02 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd Feb 1996
 .Dt HOSTS.EQUIV 5
diff --git a/share/man/man5/hosts.lpd.5 b/share/man/man5/hosts.lpd.5
index 680e64db878c..ab87d4866d95 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 1, 1996
 .Dt HOSTS.LPD 5
diff --git a/share/man/man5/intro.5 b/share/man/man5/intro.5
index 830ac217b2f8..a50030653ba6 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.
 .\"
-.\"	$Id: intro.5,v 1.1 1997/02/16 12:13:32 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 16, 1997
 .Dt INTRO 5
diff --git a/share/man/man5/kernfs.5 b/share/man/man5/kernfs.5
index fb8028fa3ad7..1976f134c3bc 100644
--- a/share/man/man5/kernfs.5
+++ b/share/man/man5/kernfs.5
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: kernfs.5,v 1.6 1998/06/28 21:33:42 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 14, 1996
 .Dt KERNFS 5
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 86f182359a68..2991453a7570 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.
 .\"
-.\"	$Id: link.5,v 1.11 1997/02/22 13:26:03 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 23, 1993
 .Dt LINK 5
diff --git a/share/man/man5/motd.5 b/share/man/man5/motd.5
index bcdd6dbe2930..3564b402522e 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.
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 13, 1997
 .Dt MOTD 5
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 347acb63ca01..6bd1285af173 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
-.\"	$Id: networks.5,v 1.3 1997/03/07 03:28:03 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt NETWORKS 5
diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index 7ff6f4d1afd4..890f021571b9 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\"	$Id: passwd.5,v 1.23 1999/04/22 04:05:56 grog Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 29, 1994
 .Dt PASSWD 5
diff --git a/share/man/man5/pbm.5 b/share/man/man5/pbm.5
index 0afa650366ea..285ac43d2323 100644
--- a/share/man/man5/pbm.5
+++ b/share/man/man5/pbm.5
@@ -1,5 +1,5 @@
 .\"
-.\"	$Id: pbm.5,v 1.4 1997/06/23 04:02:45 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 27, 1991
 .Dt PBM 5
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
index f0362e407b89..e13f368a15f9 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt PHONES 5
diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5
index b4ffb1eb6ee6..5f9a63404aa7 100644
--- a/share/man/man5/procfs.5
+++ b/share/man/man5/procfs.5
@@ -1,4 +1,4 @@
-.\" $Id: procfs.5,v 1.10 1998/06/28 21:33:42 hoek Exp $
+.\" $FreeBSD$
 .\" 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 2c11722bfe20..4756025f4e24 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt PROTOCOLS 5
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index b36911c07c87..04666ce097a4 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.
 .\"
-.\"     $Id: rc.conf.5,v 1.42 1999/08/22 23:25:35 brian Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 26, 1997
 .Dt RC.CONF 5
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index fd252dafb265..0f89a7c9f5ed 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
-.\"	$Id: remote.5,v 1.3 1997/03/07 03:28:05 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt REMOTE 5
diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5
index c8cd9a378d98..7cfde209a387 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
-.\"	$Id: resolver.5,v 1.4 1997/05/15 20:05:16 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 11, 1993
 .Dt RESOLVER 5
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index 8ec751b6a258..30321fb9864c 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt SERVICES 5
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index b5d0f54fea29..70626ad3ef5b 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt SHELLS 5
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index 864de7eb8a59..29d283688f32 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt STAB 5
diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index 867e6fab0621..907fbdf9f2ab 100644
--- a/share/man/man5/types.5
+++ b/share/man/man5/types.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)types.5	8.1 (Berkeley) 6/5/93
-.\"	$Id: types.5,v 1.7 1997/02/22 13:26:08 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt TYPES 5
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index a68ca09cb513..b430b8f8b4d0 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
-.\"	$Id: utmp.5,v 1.7 1998/01/03 20:31:25 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 17, 1994
 .Dt UTMP 5
diff --git a/share/man/man6/Makefile b/share/man/man6/Makefile
index 16f76fbde06a..5384a50bae34 100644
--- a/share/man/man6/Makefile
+++ b/share/man/man6/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 MAN6=	intro.6
 
diff --git a/share/man/man6/intro.6 b/share/man/man6/intro.6
index 936b1311e9bc..56e569c63431 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.
 .\"
-.\"	$Id: intro.6,v 1.1 1997/02/16 11:30:03 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 16, 1997
 .Dt INTRO 6
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index e0e17ef56aa4..5af00101d4c4 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.8 1998/11/26 00:21:24 jkoshy Exp $
+# $FreeBSD$
 
 #MISSING: eqnchar.7 ms.7 term.7
 MAN7=	ascii.7 clocks.7 environ.7 hier.7 hostname.7 intro.7 mailaddr.7 \
diff --git a/share/man/man7/ascii.7 b/share/man/man7/ascii.7
index a1e803006f0c..7bfbe2b180c7 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt ASCII 7
diff --git a/share/man/man7/clocks.7 b/share/man/man7/clocks.7
index 6bc54330cd83..f845c254604b 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.
 .\"
-.\" $Id: clocks.7,v 1.7 1997/09/04 20:59:33 jdp Exp $
+.\" $FreeBSD$
 .\" "
 .Dd April 1, 1996
 .Os
diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7
index 8dd2e0acfa2a..856c932c2a38 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
-.\"	$Id: environ.7,v 1.11 1999/02/04 07:13:49 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt ENVIRON 7
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index c2f3b50d468a..b91c92667291 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
-.\"	$Id: hier.7,v 1.18 1999/05/29 12:58:44 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 49788814a2b2..7c10ab6274d7 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt HOSTNAME 7
diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7
index 8f26eca22bd7..b1bbd27a28f3 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt INTRO 7
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index eac986c8a327..745fe26b58ee 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1993
 .Dt MAILADDR 7
diff --git a/share/man/man7/man.7 b/share/man/man7/man.7
index bccc9bf0e60c..af63893ba6e9 100644
--- a/share/man/man7/man.7
+++ b/share/man/man7/man.7
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd November 30, 1998
 .Os
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index 0d8b3a9d181b..32ff9e253234 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
-.\"	$Id: mdoc.7,v 1.9 1999/06/15 19:03:54 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Os
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 16e4215d9fc8..546444ffe6dd 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mdoc.samples.7	8.2 (Berkeley) 12/30/93
-.\"	$Id: mdoc.samples.7,v 1.19 1999/06/24 00:59:40 mpp Exp $
+.\" $FreeBSD$
 .\"
 .\" This tutorial sampler invokes every macro in the package several
 .\" times and is guaranteed to give a worst case performance
diff --git a/share/man/man7/operator.7 b/share/man/man7/operator.7
index 8aaacfc0bb4c..1f4d9b891ea5 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt OPERATOR 7
diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7
index 34db72ff74b1..8fc977f1c04a 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.
 .\"
-.\" $Id: ports.7,v 1.14 1999/08/15 10:48:24 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 25, 1998
 .Dt PORTS 7
diff --git a/share/man/man7/security.7 b/share/man/man7/security.7
index 3a828f151ac3..6eecd3d5478c 100644
--- a/share/man/man7/security.7
+++ b/share/man/man7/security.7
@@ -2,7 +2,7 @@
 .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
 .\" the source tree.
 .\"
-.\"	$Id: security.7,v 1.7 1999/03/15 15:43:10 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 20, 1998
 .Dt SECURITY 7
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 39a0c06b23ec..09ce927c54ab 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.10 1999/05/02 00:13:44 obrien Exp $
+# $FreeBSD$
 
 MAN8=	adding_user.8 crash.8 diskless.8 intro.8 rc.8 sticky.8
 
diff --git a/share/man/man8/adding_user.8 b/share/man/man8/adding_user.8
index 6711f1ac09b3..d52f385bc88d 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt ADDING_USER 8
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index 2523c141afa1..61d84c018be8 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.
 .\"
-.\"	$Id: crash.8,v 1.7 1997/03/21 20:14:12 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 2, 1996
 .Dt CRASH 8
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 902b431de66d..f4e850721763 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ,\"
-.\"     $Id: diskless.8,v 1.3 1999/07/12 21:02:00 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 2, 1994
 .Dt DISKLESS 8
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index 85000d4ba74e..9b03f284dd5a 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt INTRO 8
diff --git a/share/man/man8/man8.alpha/MAKEDEV.8 b/share/man/man8/man8.alpha/MAKEDEV.8
index 052a90477963..91a5113bbf45 100644
--- a/share/man/man8/man8.alpha/MAKEDEV.8
+++ b/share/man/man8/man8.alpha/MAKEDEV.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)MAKEDEV.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: MAKEDEV.8,v 1.12 1999/04/29 02:12:08 billf Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt MAKEDEV 8 Alpha
diff --git a/share/man/man8/man8.alpha/Makefile b/share/man/man8/man8.alpha/Makefile
index 2edcada3890f..c7804139061e 100644
--- a/share/man/man8/man8.alpha/Makefile
+++ b/share/man/man8/man8.alpha/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.5 1997/03/07 03:28:23 jmg Exp $
+# $FreeBSD$
 
 MAN8=	MAKEDEV.8
 MANSUBDIR=/alpha
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index b13c3fa2a210..edc468dde674 100644
--- a/share/man/man8/man8.i386/MAKEDEV.8
+++ b/share/man/man8/man8.i386/MAKEDEV.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)MAKEDEV.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: MAKEDEV.8,v 1.11 1999/03/07 18:53:10 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt MAKEDEV 8 i386
diff --git a/share/man/man8/man8.i386/Makefile b/share/man/man8/man8.i386/Makefile
index 055dbc95b904..12c84b14ca7f 100644
--- a/share/man/man8/man8.i386/Makefile
+++ b/share/man/man8/man8.i386/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.5 1997/03/07 03:28:23 jmg Exp $
+# $FreeBSD$
 
 MAN8=	MAKEDEV.8
 MANSUBDIR=/i386
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index f4a48395a20d..cfcc786f5a38 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: rc.8,v 1.6 1998/12/12 23:08:34 dillon Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt RC 8
diff --git a/share/man/man8/sticky.8 b/share/man/man8/sticky.8
index 2d3f5186a881..becef0960144 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
-.\"	$Id: sticky.8,v 1.4 1997/12/26 12:26:43 helbig Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt STICKY 8
diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 8dda70484a37..bc268565d29e 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
-.\"	$Id: yp.4,v 1.14 1997/12/22 07:35:40 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 5, 1993
 .Dt YP 4
diff --git a/share/man/man9/BUS_CONNECT_INTR.9 b/share/man/man9/BUS_CONNECT_INTR.9
index 998faf7351e3..6a88375c7fe7 100644
--- a/share/man/man9/BUS_CONNECT_INTR.9
+++ b/share/man/man9/BUS_CONNECT_INTR.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.
 .\"
-.\" $Id: BUS_CONNECT_INTR.9,v 1.1 1998/09/03 21:52:04 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/BUS_CREATE_INTR.9 b/share/man/man9/BUS_CREATE_INTR.9
index 89c43cb7b589..8588db3adc88 100644
--- a/share/man/man9/BUS_CREATE_INTR.9
+++ b/share/man/man9/BUS_CREATE_INTR.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.
 .\"
-.\" $Id: BUS_CREATE_INTR.9,v 1.1 1998/09/03 21:52:04 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/BUS_PRINT_CHILD.9 b/share/man/man9/BUS_PRINT_CHILD.9
index 5dbea154ce22..3fd8a8fc6651 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.
 .\"
-.\" $Id: BUS_PRINT_CHILD.9,v 1.4 1999/08/15 10:48:26 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/BUS_READ_IVAR.9 b/share/man/man9/BUS_READ_IVAR.9
index 47666a6837dd..803f46401fa6 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.
 .\"
-.\" $Id: BUS_READ_IVAR.9,v 1.1 1998/09/03 21:52:04 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/DEVICE_ATTACH.9 b/share/man/man9/DEVICE_ATTACH.9
index 7b7a211f2b10..f97089161170 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.
 .\"
-.\" $Id: DEVICE_ATTACH.9,v 1.1 1998/09/03 21:52:04 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_ATTACH 9
diff --git a/share/man/man9/DEVICE_DETACH.9 b/share/man/man9/DEVICE_DETACH.9
index 8c58455d5c0a..e0f27ef28b7a 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.
 .\"
-.\" $Id: DEVICE_DETACH.9,v 1.1 1998/09/03 21:52:04 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/DEVICE_PROBE.9 b/share/man/man9/DEVICE_PROBE.9
index 6c853bf32f61..8de3c499f946 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.
 .\"
-.\" $Id: DEVICE_PROBE.9,v 1.1 1998/09/03 21:52:04 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/DEVICE_SHUTDOWN.9 b/share/man/man9/DEVICE_SHUTDOWN.9
index 680868492657..4a7847dafb76 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.
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Os
diff --git a/share/man/man9/MD5.9 b/share/man/man9/MD5.9
index 8fe94cebf44b..6535f52bd6e5 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 17, 1996
 .Dt MD5 9
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 5cad487ef910..4283f34378fc 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.47 1999/03/17 20:17:31 ghelmer Exp $
+# $FreeBSD$
 
 MAN9=	MD5.9 \
 	VFS.9 VFS_FHTOVP.9 VFS_INIT.9 VFS_MOUNT.9 VFS_QUOTACTL.9 \
diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9
index afb774a4dfd8..c84100b6d1a0 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.
 .\"
-.\" $Id: VFS.9,v 1.1 1997/03/03 17:59:52 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_FHTOVP.9 b/share/man/man9/VFS_FHTOVP.9
index cb94d6f1729c..875fed481f4e 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.
 .\"
-.\" $Id: VFS_FHTOVP.9,v 1.3 1998/03/12 07:31:04 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_INIT.9 b/share/man/man9/VFS_INIT.9
index 97b2a06a9c69..3381e136c608 100644
--- a/share/man/man9/VFS_INIT.9
+++ b/share/man/man9/VFS_INIT.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.
 .\"
-.\" $Id: VFS_INIT.9,v 1.4 1997/12/25 09:36:40 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_MOUNT.9 b/share/man/man9/VFS_MOUNT.9
index d64e92ba569a..a202935aa1a9 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.
 .\"
-.\" $Id: VFS_MOUNT.9,v 1.4 1998/03/12 07:31:04 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_QUOTACTL.9 b/share/man/man9/VFS_QUOTACTL.9
index 0e55190137d8..006e622dd98a 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.
 .\"
-.\" $Id: VFS_QUOTACTL.9,v 1.3 1998/03/12 07:31:05 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_ROOT.9 b/share/man/man9/VFS_ROOT.9
index edfd45cde911..9c633ce6e44a 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.
 .\"
-.\" $Id: VFS_ROOT.9,v 1.3 1998/03/12 07:31:05 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_START.9 b/share/man/man9/VFS_START.9
index a254dd1b40d9..c327c82dbdd0 100644
--- a/share/man/man9/VFS_START.9
+++ b/share/man/man9/VFS_START.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.
 .\"
-.\" $Id: VFS_START.9,v 1.3 1998/03/12 07:31:05 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_STATFS.9 b/share/man/man9/VFS_STATFS.9
index 3e46dd84a310..61b9787bb282 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.
 .\"
-.\" $Id: VFS_STATFS.9,v 1.3 1998/03/12 07:31:06 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_SYNC.9 b/share/man/man9/VFS_SYNC.9
index 11b165217474..b1b0a34134df 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.
 .\"
-.\" $Id: VFS_SYNC.9,v 1.4 1998/03/12 07:31:06 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_UNMOUNT.9 b/share/man/man9/VFS_UNMOUNT.9
index 432514909d13..03fb7f3d95aa 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.
 .\"
-.\" $Id: VFS_UNMOUNT.9,v 1.3 1998/03/12 07:31:06 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_VGET.9 b/share/man/man9/VFS_VGET.9
index 896a60972938..98767c9c4b7d 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.
 .\"
-.\" $Id: VFS_VGET.9,v 1.3 1998/03/12 07:31:07 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VFS_VPTOFH.9 b/share/man/man9/VFS_VPTOFH.9
index beeb199648ab..ade15c061fe5 100644
--- a/share/man/man9/VFS_VPTOFH.9
+++ b/share/man/man9/VFS_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.
 .\"
-.\" $Id: VFS_VPTOFH.9,v 1.4 1998/03/12 07:31:07 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ABORTOP.9 b/share/man/man9/VOP_ABORTOP.9
index 7fc1c3f1e4ea..4cfe66f40151 100644
--- a/share/man/man9/VOP_ABORTOP.9
+++ b/share/man/man9/VOP_ABORTOP.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.
 .\"
-.\" $Id: VOP_ABORTOP.9,v 1.3 1997/04/13 14:48:48 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ACCESS.9 b/share/man/man9/VOP_ACCESS.9
index c740c917abba..d56e1ca8037d 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.
 .\"
-.\" $Id: VOP_ACCESS.9,v 1.4 1997/04/13 14:48:48 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_ADVLOCK.9 b/share/man/man9/VOP_ADVLOCK.9
index d641dc75a8ce..311dda222cea 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.
 .\"
-.\" $Id: VOP_ADVLOCK.9,v 1.4 1998/03/12 07:31:08 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1999
 .Os
diff --git a/share/man/man9/VOP_ATTRIB.9 b/share/man/man9/VOP_ATTRIB.9
index 6b987e61914f..c6302d35daa7 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.
 .\"
-.\" $Id: VOP_ATTRIB.9,v 1.5 1997/04/13 14:48:50 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_BWRITE.9 b/share/man/man9/VOP_BWRITE.9
index bb395d967d42..cb62d4b19a6f 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.
 .\"
-.\" $Id: VOP_BWRITE.9,v 1.2 1997/04/13 14:48:51 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_CREATE.9 b/share/man/man9/VOP_CREATE.9
index b678555a63e8..ddffbe197a29 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.
 .\"
-.\" $Id: VOP_CREATE.9,v 1.5 1998/01/20 11:08:06 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index 6d24894e8a32..6c7e2df15a34 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.
 .\"
-.\" $Id: VOP_FSYNC.9,v 1.4 1997/04/13 14:48:52 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_GETPAGES.9 b/share/man/man9/VOP_GETPAGES.9
index f2c94b769d2b..0194327c750d 100644
--- a/share/man/man9/VOP_GETPAGES.9
+++ b/share/man/man9/VOP_GETPAGES.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.
 .\"
-.\" $Id: VOP_GETPAGES.9,v 1.2 1997/04/13 14:48:53 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_INACTIVE.9 b/share/man/man9/VOP_INACTIVE.9
index 479acdc2b389..95d21db33d33 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.
 .\"
-.\" $Id: VOP_INACTIVE.9,v 1.2 1997/04/13 14:39:57 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_IOCTL.9 b/share/man/man9/VOP_IOCTL.9
index e02c8946d889..c22e2acf8daf 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.
 .\"
-.\" $Id: VOP_IOCTL.9,v 1.3 1997/04/13 14:39:58 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LINK.9 b/share/man/man9/VOP_LINK.9
index f7147b241d58..0eba06e46dc6 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.
 .\"
-.\" $Id: VOP_LINK.9,v 1.5 1999/02/13 07:44:14 dillon Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LOCK.9 b/share/man/man9/VOP_LOCK.9
index a35b1da9a478..7061f7b77282 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.
 .\"
-.\" $Id: VOP_LOCK.9,v 1.5 1999/03/17 20:17:32 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index 3f8e38d3e5f7..4ad768178a0f 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.
 .\"
-.\" $Id: VOP_LOOKUP.9,v 1.6 1997/11/23 17:58:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 24, 1997
 .Os FreeBSD
diff --git a/share/man/man9/VOP_MMAP.9 b/share/man/man9/VOP_MMAP.9
index 05eecd7725de..0e772d2dfbca 100644
--- a/share/man/man9/VOP_MMAP.9
+++ b/share/man/man9/VOP_MMAP.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.
 .\"
-.\" $Id: VOP_MMAP.9,v 1.2 1997/04/13 14:48:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_OPENCLOSE.9 b/share/man/man9/VOP_OPENCLOSE.9
index 4b6eadf971f1..8c0a0f6f24cd 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.
 .\"
-.\" $Id: VOP_OPENCLOSE.9,v 1.3 1997/04/13 14:48:55 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PATHCONF.9 b/share/man/man9/VOP_PATHCONF.9
index ec06ac0434a3..cfb392db48a8 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.
 .\"
-.\" $Id: VOP_PATHCONF.9,v 1.4 1997/09/29 10:10:54 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_PRINT.9 b/share/man/man9/VOP_PRINT.9
index 75f2ebf6795b..b686ebf30f3c 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.
 .\"
-.\" $Id: VOP_PRINT.9,v 1.2 1997/04/13 14:48:56 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RDWR.9 b/share/man/man9/VOP_RDWR.9
index d4018532f1ff..5e67262da0c7 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.
 .\"
-.\" $Id: VOP_RDWR.9,v 1.6 1997/09/29 10:10:54 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READDIR.9 b/share/man/man9/VOP_READDIR.9
index b87befb3d21d..11a4ce0d56d5 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.
 .\"
-.\" $Id: VOP_READDIR.9,v 1.4 1997/04/13 14:39:59 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_READLINK.9 b/share/man/man9/VOP_READLINK.9
index 8b07ba94484a..8d364da09275 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.
 .\"
-.\" $Id: VOP_READLINK.9,v 1.5 1997/09/29 10:10:55 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REALLOCBLKS.9 b/share/man/man9/VOP_REALLOCBLKS.9
index b8f52e289f95..51da82793da1 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.
 .\"
-.\" $Id: VOP_REALLOCBLKS.9,v 1.3 1997/09/29 10:10:56 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_REMOVE.9 b/share/man/man9/VOP_REMOVE.9
index 340c8717b2d3..05a7e454c823 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.
 .\"
-.\" $Id: VOP_REMOVE.9,v 1.4 1997/04/13 14:48:58 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_RENAME.9 b/share/man/man9/VOP_RENAME.9
index 2723db7b8134..d4398556bf16 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.
 .\"
-.\" $Id: VOP_RENAME.9,v 1.5 1997/04/13 14:48:59 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_STRATEGY.9 b/share/man/man9/VOP_STRATEGY.9
index 206f31814b83..5633f3d5dc34 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.
 .\"
-.\" $Id: VOP_STRATEGY.9,v 1.5 1998/03/12 07:31:15 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/VOP_VPTOFH.9 b/share/man/man9/VOP_VPTOFH.9
index beeb199648ab..ade15c061fe5 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.
 .\"
-.\" $Id: VFS_VPTOFH.9,v 1.4 1998/03/12 07:31:07 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/at_exit.9 b/share/man/man9/at_exit.9
index 07d452d67d30..352e6b229e22 100644
--- a/share/man/man9/at_exit.9
+++ b/share/man/man9/at_exit.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.
 .\"
-.\" $Id: at_exit.9,v 1.7 1997/04/13 14:49:02 bde Exp $
+.\" $FreeBSD$
 .\" "
 .Dd August 15, 1996
 .Os
diff --git a/share/man/man9/at_fork.9 b/share/man/man9/at_fork.9
index bd941dd1542d..369bc54d776b 100644
--- a/share/man/man9/at_fork.9
+++ b/share/man/man9/at_fork.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.
 .\"
-.\" $Id: at_fork.9,v 1.6 1997/04/13 14:49:03 bde Exp $
+.\" $FreeBSD$
 .\" "
 .Dd August 15, 1996
 .Os
diff --git a/share/man/man9/at_shutdown.9 b/share/man/man9/at_shutdown.9
index fb03dbe9490a..2552c4351beb 100644
--- a/share/man/man9/at_shutdown.9
+++ b/share/man/man9/at_shutdown.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.
 .\"
-.\" $Id: at_shutdown.9,v 1.11 1998/03/12 07:31:16 charnier Exp $
+.\" $FreeBSD$
 .\" "
 .Dd August 15, 1996
 .Os
diff --git a/share/man/man9/bios.9 b/share/man/man9/bios.9
index 088b28ee3d08..1546b518297c 100644
--- a/share/man/man9/bios.9
+++ b/share/man/man9/bios.9
@@ -1,4 +1,4 @@
-.\" $Id: bios.9,v 1.2 1997/08/01 15:17:54 msmith Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1997 Michael Smith
 .\" All rights reserved.
diff --git a/share/man/man9/boot.9 b/share/man/man9/boot.9
index 07260bafaad5..6ce3ac134bd2 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 14, 1997
 .Dt BOOT 9
diff --git a/share/man/man9/buf.9 b/share/man/man9/buf.9
index 807e446a7edb..300dff0d09df 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.
 .\"
-.\"	$Id: buf.9,v 1.2 1999/02/01 22:55:54 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 22, 1998
 .Dt BUF 9
diff --git a/share/man/man9/bus_generic_attach.9 b/share/man/man9/bus_generic_attach.9
index d2ce0043eacf..8bbcffc8ec4c 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.
 .\"
-.\" $Id: bus_generic_attach.9,v 1.1 1998/09/03 21:52:04 dfr Exp $
+.\" $FreeBSD$
 .\"
 .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 a1d07ae087c2..8b15c3bec469 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.
 .\"
-.\" $Id: bus_generic_detach.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_DETACH 9
diff --git a/share/man/man9/bus_generic_map_intr.9 b/share/man/man9/bus_generic_map_intr.9
index 4adabb8c1ec5..ce019503f85a 100644
--- a/share/man/man9/bus_generic_map_intr.9
+++ b/share/man/man9/bus_generic_map_intr.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.
 .\"
-.\" $Id: bus_generic_map_intr.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_MAP_INTR 9
diff --git a/share/man/man9/bus_generic_print_child.9 b/share/man/man9/bus_generic_print_child.9
index ac374fc9c2ab..2e7f830054b7 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.
 .\"
-.\" $Id: bus_generic_print_child.9,v 1.3 1999/07/29 01:01:49 mdodd Exp $
+.\" $FreeBSD$
 .\"
 .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 23d8da47bcf3..a7fdec4949e1 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.
 .\"
-.\" $Id: bus_generic_read_ivar.9,v 1.2 1999/03/06 17:18:10 bde Exp $
+.\" $FreeBSD$
 .\"
 .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 a5b1ad709b66..b51d6e059aef 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.
 .\"
-.\" $Id: bus_generic_shutdown.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_SHUTDOWN 9
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index bf112cf9eb11..2f6bc4bf1dbf 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.
 .\"
-.\"	$Id: cd.9,v 1.9 1998/10/16 00:26:28 ken Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 10, 1998
 .Dt CD 9
diff --git a/share/man/man9/copy.9 b/share/man/man9/copy.9
index 5f42748f2b90..3dc91ca129ff 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd Jan 7, 1996
 .Dt COPY 9
diff --git a/share/man/man9/devclass.9 b/share/man/man9/devclass.9
index e21a7301f1b3..003c63d87ff5 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.
 .\"
-.\" $Id: devclass.9,v 1.2 1999/02/01 22:55:54 mpp Exp $
+.\" $FreeBSD$
 .\"
 .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 f3deea8bb659..b4c0a9f68cdf 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.
 .\"
-.\" $Id: devclass_add_driver.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .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 beb47b9246da..6fa9e2c53d17 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.
 .\"
-.\" $Id: devclass_find.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_FIND 9
diff --git a/share/man/man9/devclass_get_device.9 b/share/man/man9/devclass_get_device.9
index 7fc700197488..1b9e0a4ff2f2 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.
 .\"
-.\" $Id: devclass_get_device.9,v 1.2 1999/03/06 17:25:49 bde Exp $
+.\" $FreeBSD$
 .\"
 .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 4e2dc3e7cfeb..100c63351881 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.
 .\"
-.\" $Id: devclass_get_devices.9,v 1.2 1999/03/06 17:14:24 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_DEVICES 9
diff --git a/share/man/man9/devclass_get_maxunit.9 b/share/man/man9/devclass_get_maxunit.9
index 994525be89d3..e1d6468130ab 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.
 .\"
-.\" $Id: devclass_get_maxunit.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_MAXUNIT 9
diff --git a/share/man/man9/devclass_get_name.9 b/share/man/man9/devclass_get_name.9
index a840799bbf29..3241a42a32ae 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.
 .\"
-.\" $Id: devclass_get_name.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .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 cc479195b9cd..9472945c3424 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.
 .\"
-.\" $Id: devclass_get_softc.9,v 1.2 1999/03/06 17:25:50 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVCLASS_GET_SOFTC 9
diff --git a/share/man/man9/devfs_add_devswf.9 b/share/man/man9/devfs_add_devswf.9
index 0b631d8a16a9..31d6603dbb89 100644
--- a/share/man/man9/devfs_add_devswf.9
+++ b/share/man/man9/devfs_add_devswf.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.
 .\"
-.\" $Id: devfs_add_devswf.9,v 1.7 1998/05/06 09:13:52 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 31, 1995
 .Os FreeBSD
diff --git a/share/man/man9/devfs_link.9 b/share/man/man9/devfs_link.9
index 7c1e1f20299c..92b01ffbddaa 100644
--- a/share/man/man9/devfs_link.9
+++ b/share/man/man9/devfs_link.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.
 .\"
-.\" $Id: devfs_link.9,v 1.10 1998/08/31 16:41:07 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 31, 1995
 .Os FreeBSD
diff --git a/share/man/man9/devfs_remove_dev.9 b/share/man/man9/devfs_remove_dev.9
index e1510f8adb08..248e468cfef4 100644
--- a/share/man/man9/devfs_remove_dev.9
+++ b/share/man/man9/devfs_remove_dev.9
@@ -29,7 +29,7 @@
 .\" -translation to english:
 .\" - You can't claim it's yours without admitting to the bits I wrote.
 .\" - You don't need to say anything in binary releases unless asked.
-.\" $Id: devfs_remove_dev.9,v 1.3 1998/03/12 07:31:17 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 25, 1997
 .Os FreeBSD
diff --git a/share/man/man9/device.9 b/share/man/man9/device.9
index f61a3eac693d..e5792da2173c 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.
 .\"
-.\" $Id: device.9,v 1.2 1999/02/01 22:55:54 mpp Exp $
+.\" $FreeBSD$
 .\"
 .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 580756a4afb2..b705d004c6b7 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.
 .\"
-.\" $Id: device_add_child.9,v 1.2 1999/05/28 09:38:25 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_ADD_CHILD 9
diff --git a/share/man/man9/device_delete_child.9 b/share/man/man9/device_delete_child.9
index 3e0e1100e631..195c0f82bd83 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.
 .\"
-.\" $Id: device_delete_child.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .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 c2026bca8865..7185dba397ff 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.
 .\"
-.\" $Id: device_enable.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .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 38a6c3deb038..56b1d8ccbc71 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.
 .\"
-.\" $Id: device_find_child.9,v 1.2 1999/03/06 17:25:50 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_FIND_CHILD 9
diff --git a/share/man/man9/device_get_devclass.9 b/share/man/man9/device_get_devclass.9
index d3fb9b9a472e..0b060cd40186 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.
 .\"
-.\" $Id: device_get_devclass.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .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 be2ffde6d14c..67fd91ee2957 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.
 .\"
-.\" $Id: device_get_driver.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .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 52e6c42c1024..56691170d4f0 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.
 .\"
-.\" $Id: device_get_ivars.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_IVARS 9
diff --git a/share/man/man9/device_get_softc.9 b/share/man/man9/device_get_softc.9
index 28c925d0b4da..1a40f7eeb04c 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.
 .\"
-.\" $Id: device_get_softc.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_SOFTC 9
diff --git a/share/man/man9/device_get_state.9 b/share/man/man9/device_get_state.9
index d552e0983edf..f80e19b2a4c8 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.
 .\"
-.\" $Id: device_get_state.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_STATE 9
diff --git a/share/man/man9/device_get_unit.9 b/share/man/man9/device_get_unit.9
index 39bcd232d282..7c2a83f87e0e 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.
 .\"
-.\" $Id: device_get_unit.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_GET_UNIT 9
diff --git a/share/man/man9/device_probe_and_attach.9 b/share/man/man9/device_probe_and_attach.9
index de5db106882e..bbe69552979a 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.
 .\"
-.\" $Id: device_probe_and_attach.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .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 e39794064b06..9a9baf922ec5 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.
 .\"
-.\" $Id: device_quiet.9,v 1.1 1999/06/22 18:09:54 n_hibma Exp $
+.\" $FreeBSD$
 .\"
 .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 50986d78e7fa..5f4eea446637 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.
 .\"
-.\" $Id: device_set_desc.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DEVICE_SET_DESC 9
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index 92c0edba76c6..829245d3d064 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.
 .\"
-.\"	$Id: devstat.9,v 1.3 1999/03/06 17:10:15 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 22, 1998
 .Dt DEVSTAT 9
diff --git a/share/man/man9/driver.9 b/share/man/man9/driver.9
index bed0db22d570..e1d28cbbf09f 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.
 .\"
-.\" $Id: driver.9,v 1.1 1998/09/03 21:52:05 dfr Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1998
 .Dt DRIVER 9
diff --git a/share/man/man9/fetch.9 b/share/man/man9/fetch.9
index f5d8087e5eb8..c35bf90406b4 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd Jan 7, 1996
 .Dt FETCH 9
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index 252bca6d3561..d0eaf8e39428 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.
 .\"
-.\"	$Id: ifnet.9,v 1.6 1998/03/12 07:31:17 charnier Exp $
+.\" $FreeBSD$
 .Dd January 15, 1997
 .Os FreeBSD 3.0
 .Dt IFNET 9
diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index a41819036773..4fba880c4db2 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 22, 1997
 .Dt INITTODR 9
diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9
index 85c2bbd7d9cf..56f6bfb61398 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.
 .\"
-.\"	$Id: intro.9,v 1.8 1998/01/02 19:22:52 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 13, 1995
 .Dt INTRO 9
diff --git a/share/man/man9/kernacc.9 b/share/man/man9/kernacc.9
index 286c2f9b7884..feead90d1906 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1996
 .Dt KERNACC 9
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index c2f9d8d20a4d..67a7743616e2 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1996
 .Dt MALLOC 9
diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9
index fb94b1ae6027..d4af1f354a21 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd Nov 24, 1996
 .Dt MI_SWITCH 9
diff --git a/share/man/man9/microseq.9 b/share/man/man9/microseq.9
index c6b5a240a3ae..01fef87f374c 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.
 .\"
-.\"     $Id: microseq.9,v 1.6 1999/07/12 21:02:05 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1998
 .Dt MICROSEQ 9
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index f93c31f3b5d5..a90a5f4448d2 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -30,7 +30,7 @@
 .\" If you integrate this manpage in another OS, I'd appreciate a note 
 .\"	- eivind@freebsd.org
 .\"
-.\" $Id: namei.9,v 1.3 1999/05/29 13:00:40 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 26th, 1998
 .Os
diff --git a/share/man/man9/panic.9 b/share/man/man9/panic.9
index 894f2041ce82..30183888f737 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd August 11, 1995
 .Dt PANIC 9
diff --git a/share/man/man9/physio.9 b/share/man/man9/physio.9
index e00fdf986b48..3822af1db50f 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 15, 1996
 .Dt PHYSIO 9
diff --git a/share/man/man9/posix4.9 b/share/man/man9/posix4.9
index c3b687709564..3a02d7360b99 100644
--- a/share/man/man9/posix4.9
+++ b/share/man/man9/posix4.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: posix4.9,v 1.3 1998/03/28 11:49:07 dufault Exp $
+.\" $FreeBSD$
 .Dd March 1, 1998
 .Dt POSIX.1B 9
 .Os FreeBSD 3.0
diff --git a/share/man/man9/psignal.9 b/share/man/man9/psignal.9
index 57a862c53b21..136341fd33f0 100644
--- a/share/man/man9/psignal.9
+++ b/share/man/man9/psignal.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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 22, 1996
 .Dt PSIGNAL 9
diff --git a/share/man/man9/resettodr.9 b/share/man/man9/resettodr.9
index 4c32d43fb511..dbcbdea0a673 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd November 13, 1995
 .Dt RESETTODR 9
diff --git a/share/man/man9/rtalloc.9 b/share/man/man9/rtalloc.9
index 56a18c9611b5..db0d4b4f31e8 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.
 .\"
-.\"	$Id: rtalloc.9,v 1.6 1997/04/13 14:49:08 bde Exp $
+.\" $FreeBSD$
 .Dd October 8, 1996
 .Os
 .Dt RTALLOC 9
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index 3affc8e9729c..ac24d8e1a1d8 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.
 .\"
-.\"	$Id: rtentry.9,v 1.8 1998/06/24 13:30:25 dt Exp $
+.\" $FreeBSD$
 .Dd October 8, 1996
 .Os
 .Dt RTENTRY 9
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index 1475d79ac40f..ca86700f7a45 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.
 .\"
-.\" $Id: sleep.9,v 1.14 1999/02/01 22:55:54 mpp Exp $
+.\" $FreeBSD$
 .\" "
 .Dd December 17, 1998
 .Os
diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9
index ef1a19cad830..2aa96ebdc59d 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.
 .\"
-.\" $Id: spl.9,v 1.6 1998/01/16 18:14:34 bde Exp $
+.\" $FreeBSD$
 .\" "
 .Dd July 21, 1996
 .Os
diff --git a/share/man/man9/store.9 b/share/man/man9/store.9
index 3555f1de423c..f62a215ca6b2 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd Jan 7, 1996
 .Dt STORE 9
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index 5511deb3e74c..831ea33cfe76 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: style.9,v 1.25 1999/07/31 15:04:37 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 14, 1995
 .Dt STYLE 9
diff --git a/share/man/man9/suser.9 b/share/man/man9/suser.9
index f92c087fa8e3..c38ddaf48328 100644
--- a/share/man/man9/suser.9
+++ b/share/man/man9/suser.9
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: suser.9,v 1.7 1999/06/02 16:33:22 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd Oct 15, 1996
 .Dt SUSER 9
diff --git a/share/man/man9/time.9 b/share/man/man9/time.9
index dd87d9b266fb..ec78719855bd 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 22, 1997
 .Dt TIME 9
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index 1c9b7f319bb1..0857d715c41c 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.
 .\"
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd September 10, 1996
 .Dt TIMEOUT 9
diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9
index 290fa10dd318..b2aa68403f55 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.
 .\"
-.\" $Id: uio.9,v 1.3 1997/02/22 13:26:29 peter Exp $
+.\" $FreeBSD$
 .\" "
 .Dd February 2, 1997
 .Os
diff --git a/share/man/man9/vget.9 b/share/man/man9/vget.9
index 74496e873267..b0d4c5758b50 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.
 .\"
-.\" $Id: vget.9,v 1.3 1997/04/13 14:49:10 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index 3e5deddfd110..eff8908aef0c 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.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.
 .\"
-.\" $Id: vnode.9,v 1.7 1998/09/28 23:36:35 eivind Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1999
 .Os
diff --git a/share/man/man9/vput.9 b/share/man/man9/vput.9
index ae6b493aabe3..88f829aaa3db 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.
 .\"
-.\" $Id: vput.9,v 1.4 1997/09/29 10:11:00 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vref.9 b/share/man/man9/vref.9
index dea69285ce3b..8bbbfaf028fc 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.
 .\"
-.\" $Id: vref.9,v 1.4 1997/09/29 10:11:01 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vrele.9 b/share/man/man9/vrele.9
index 9573eec2a890..a5c0e751ad3e 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.
 .\"
-.\" $Id: vrele.9,v 1.4 1997/09/29 10:11:02 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 24, 1996
 .Os
diff --git a/share/man/man9/vslock.9 b/share/man/man9/vslock.9
index 676a7af8bec3..e921ce0892fc 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.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd Jun 15, 1996
 .Dt VSLOCK 9
diff --git a/share/me/me.7 b/share/me/me.7
index 101245e9eedb..cdeba3803015 100644
--- a/share/me/me.7
+++ b/share/me/me.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)me.7	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .hc %
 .TH ME 7 "June 5, 1993"
diff --git a/share/me/orig_me.7 b/share/me/orig_me.7
index 101245e9eedb..cdeba3803015 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
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .hc %
 .TH ME 7 "June 5, 1993"
diff --git a/share/misc/Makefile b/share/misc/Makefile
index 6fa7a3d41435..f437dc04e7f1 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.14 1998/09/11 16:38:20 dt Exp $
+# $FreeBSD$
 
 FILES=	ascii birthtoken bsd-family-tree eqnchar flowers init.ee inter.phone \
 	iso3166 iso639 man.template mdoc.template operator scsi_modes
diff --git a/share/misc/inter.phone b/share/misc/inter.phone
index c9ecbe69b2f6..e0f4c45e6b3e 100644
--- a/share/misc/inter.phone
+++ b/share/misc/inter.phone
@@ -1,6 +1,6 @@
 # Country Code : City Code : City : Country
 #	@(#)inter.phone	8.1 (Berkeley) 6/9/93
-#	$Id: inter.phone,v 1.16 1997/03/03 05:01:54 adam Exp $
+# $FreeBSD$
 #
 7:095:Moscow:Russia
 7:::Kazakhstan
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index e23f5837af0f..a6fe68cf00b8 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -1,4 +1,4 @@
-#	$Id: iso3166,v 1.4 1997/10/28 15:45:09 wollman Exp $
+# $FreeBSD$
 #
 # ISO 3166 country codes
 # Ths includes many places that are not legally independent countries,
diff --git a/share/misc/iso639 b/share/misc/iso639
index 351613e11b3a..a321f526b796 100644
--- a/share/misc/iso639
+++ b/share/misc/iso639
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # ISO 639 language codes
 #
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 7a3b8908efab..e8abc6348f67 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.25 1999/03/31 23:53:50 asami Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 FILES=	bsd.README
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index a1c4a2691565..6a0cee323eb6 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,5 +1,5 @@
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
-#	$Id: bsd.README,v 1.11 1997/03/09 15:51:07 wosch Exp $
+# $FreeBSD$
 
 XXX This document is seriously out of date, it is currenly being revised.
 
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index b24e9c328571..4a4f7b4742aa 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.dep.mk,v 1.25 1998/06/05 18:38:54 dt Exp $
+# $FreeBSD$
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 1ba17c3368ef..000e75a8ab90 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
-#	$Id: bsd.doc.mk,v 1.45 1998/08/02 13:50:23 bde Exp $
+# $FreeBSD$
 #
 # The include file <bsd.doc.mk> handles installing BSD troff documents.
 #
diff --git a/share/mk/bsd.docb.mk b/share/mk/bsd.docb.mk
index 014e4817825c..0e5df47b4d2d 100644
--- a/share/mk/bsd.docb.mk
+++ b/share/mk/bsd.docb.mk
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 # The include file <bsd.docb.mk> handles installing SGML/docbook documents.
 #
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index b3f71cf58782..32f22d9d812a 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.info.mk,v 1.54 1999/01/20 17:22:11 ache Exp $
+# $FreeBSD$
 #
 # 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.kern.mk b/share/mk/bsd.kern.mk
index 16b4f74849c7..b4bd9deb6966 100644
--- a/share/mk/bsd.kern.mk
+++ b/share/mk/bsd.kern.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.kern.mk,v 1.14 1999/01/29 06:22:19 dillon Exp $
+# $FreeBSD$
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk
index be04cca23164..02a7a73acce5 100644
--- a/share/mk/bsd.kmod.mk
+++ b/share/mk/bsd.kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.kmod.mk,v 1.61 1999/04/23 20:53:34 peter Exp $
+# $FreeBSD$
 #
 # The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
 #
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 454a6a4dbbea..7d10c329c602 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
-#	$Id: bsd.lib.mk,v 1.87 1999/06/24 22:50:19 jmg Exp $
+# $FreeBSD$
 #
 
 .if !target(__initialized__)
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 8da38c66c1d9..8529b9d8d3f2 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.libnames.mk,v 1.21 1999/03/14 20:45:05 markm Exp $
+# $FreeBSD$
 #
 # 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.man.mk b/share/mk/bsd.man.mk
index 17f29752f824..3c47134dbbc1 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.man.mk,v 1.29 1998/09/07 05:55:02 jb Exp $
+# $FreeBSD$
 #
 # The include file <bsd.man.mk> handles installing manual pages and 
 # their links.
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 8498434ddab4..9d22d75b2ed9 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.obj.mk,v 1.27 1999/03/14 20:41:13 markm Exp $
+# $FreeBSD$
 #
 # 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 2d981da22224..a1ae15344bd1 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.own.mk,v 1.23 1999/04/23 20:53:34 peter Exp $
+# $FreeBSD$
 #
 # 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.port.post.mk b/share/mk/bsd.port.post.mk
index d34d246c5fb9..82c203c86ec3 100644
--- a/share/mk/bsd.port.post.mk
+++ b/share/mk/bsd.port.post.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.port.post.mk,v 1.1 1998/11/11 05:21:28 asami Exp $
+# $FreeBSD$
 
 AFTERPORTMK=	yes
 
diff --git a/share/mk/bsd.port.pre.mk b/share/mk/bsd.port.pre.mk
index 739ebd51cfef..4c22c64d0844 100644
--- a/share/mk/bsd.port.pre.mk
+++ b/share/mk/bsd.port.pre.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.port.pre.mk,v 1.1 1998/11/11 05:21:29 asami Exp $
+# $FreeBSD$
 
 BEFOREPORTMK=	yes
 
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 6d1bf932b99b..1b7830a7ac60 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
-#	$Id: bsd.prog.mk,v 1.83 1999/05/06 02:58:30 bde Exp $
+# $FreeBSD$
 
 .if !target(__initialized__)
 __initialized__:
diff --git a/share/mk/bsd.sgml.mk b/share/mk/bsd.sgml.mk
index 5f4c8e8917c5..a4de905a32ea 100644
--- a/share/mk/bsd.sgml.mk
+++ b/share/mk/bsd.sgml.mk
@@ -1,7 +1,7 @@
 #       bsd.sgml.mk - 8 Sep 1995 John Fieber
 #       This file is in the public domain.
 #
-#	$Id: bsd.sgml.mk,v 1.26 1998/08/08 07:02:08 peter Exp $
+# $FreeBSD$
 #
 # The include file <bsd.sgml.mk> handles installing sgml documents.
 #
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 4cf445c7d9d4..4c51cebab5a0 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
-#	$Id: bsd.subdir.mk,v 1.26 1999/03/14 20:41:14 markm Exp $
+# $FreeBSD$
 #
 # The include file <bsd.subdir.mk> contains the default targets
 # for building subdirectories. 
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 490209e86d6d..abdc9f97a9cc 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-#	$Id: sys.mk,v 1.41 1998/08/29 01:30:13 dillon Exp $
+# $FreeBSD$
 
 unix		?=	We run FreeBSD, not UNIX.
 
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index c67d7636b106..45f376775af0 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -1,4 +1,4 @@
-#	$Id: dot.cshrc,v 1.8 1997/09/26 08:28:29 joerg Exp $
+# $FreeBSD$
 #
 # .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 de6f47cc7494..81c5d089e95e 100644
--- a/share/skel/dot.login
+++ b/share/skel/dot.login
@@ -1,4 +1,4 @@
-#	$Id: dot.login,v 1.10 1997/02/22 13:56:32 peter Exp $
+# $FreeBSD$
 #
 # .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 9a933af2a360..f4ac63b5812d 100644
--- a/share/skel/dot.login_conf
+++ b/share/skel/dot.login_conf
@@ -1,4 +1,4 @@
-#	$Id: dot.login,v 1.11 1997/08/15 23:41:24 ache Exp $
+# $FreeBSD$
 #
 # see login.conf(5)
 #
diff --git a/share/skel/dot.mail_aliases b/share/skel/dot.mail_aliases
index 43c8d4504b96..98e32ce47e48 100644
--- a/share/skel/dot.mail_aliases
+++ b/share/skel/dot.mail_aliases
@@ -1,4 +1,4 @@
-#	$Id: dot.mailrc,v 1.4 1997/02/22 13:56:32 peter Exp $
+# $FreeBSD$
 #
 # .mail_aliases - private mail aliases
 #
diff --git a/share/skel/dot.mailrc b/share/skel/dot.mailrc
index a0c481bc9f6d..9ab6ac0c8e8c 100644
--- a/share/skel/dot.mailrc
+++ b/share/skel/dot.mailrc
@@ -1,4 +1,4 @@
-#	$Id: dot.mailrc,v 1.4 1997/02/22 13:56:32 peter Exp $
+# $FreeBSD$
 #
 # .mailrc - mail resources
 #
diff --git a/share/skel/dot.profile b/share/skel/dot.profile
index 082b2abc6903..a5d3713fc00f 100644
--- a/share/skel/dot.profile
+++ b/share/skel/dot.profile
@@ -1,4 +1,4 @@
-#	$Id: dot.profile,v 1.17 1998/08/14 13:49:57 thepish Exp $
+# $FreeBSD$
 #
 # .profile - Bourne Shell startup script for login shells
 #
diff --git a/share/skel/dot.rhosts b/share/skel/dot.rhosts
index 3f76a73bc436..30132d57c4be 100644
--- a/share/skel/dot.rhosts
+++ b/share/skel/dot.rhosts
@@ -1,4 +1,4 @@
-# 	$Id$
+# $FreeBSD$
 #
 # .rhosts - trusted remote host name and user data base
 #
diff --git a/share/skel/dot.shrc b/share/skel/dot.shrc
index 57103fe49a2e..fbc2feec7e70 100644
--- a/share/skel/dot.shrc
+++ b/share/skel/dot.shrc
@@ -1,4 +1,4 @@
-#	$Id: dot.profile,v 1.12 1997/07/15 09:37:02 charnier Exp $
+# $FreeBSD$
 #
 # .shrc - bourne shell startup file 
 #
diff --git a/share/syscons/Makefile b/share/syscons/Makefile
index 66cf5b35c3b2..9cbf100f13b9 100644
--- a/share/syscons/Makefile
+++ b/share/syscons/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 SUBDIR= fonts keymaps scrnmaps
 
diff --git a/share/syscons/fonts/INDEX.fonts b/share/syscons/fonts/INDEX.fonts
index 4812a61db57d..1b480d535362 100644
--- a/share/syscons/fonts/INDEX.fonts
+++ b/share/syscons/fonts/INDEX.fonts
@@ -1,5 +1,5 @@
 #
-# $Id: INDEX.fonts,v 1.8 1998/11/05 15:35:38 roberto Exp $
+# $FreeBSD$
 #
 # database for vidfont(8) 
 #
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index 39e1001f242c..cc62fb2b6a16 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17 1998/05/04 11:24:00 phk Exp $
+# $FreeBSD$
 
 FONTS=	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
 	cp437-thin-8x8.fnt cp437-thin-8x16.fnt \
diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps
index 2359aae04725..5f3905e5beca 100644
--- a/share/syscons/keymaps/INDEX.keymaps
+++ b/share/syscons/keymaps/INDEX.keymaps
@@ -1,4 +1,4 @@
-# $Id: INDEX.keymaps,v 1.28 1999/07/07 13:20:10 yokota Exp $
+# $FreeBSD$
 #
 # database for kbdmap(8) 
 #
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index 263cc446648a..8d416395ae72 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.36 1999/07/07 13:20:11 yokota Exp $
+# $FreeBSD$
 
 KEYMAPS=  INDEX.keymaps
 KEYMAPS+= be.iso.kbd be.iso.acc.kbd
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index 94c02cf714a9..f9ad6c4d174e 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/07/07 02:30:45 bde Exp $
+# $FreeBSD$
 
 SCRMAPS = koi8-r2cp866.scm iso-8859-1_to_cp437.scm
 
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
index 306fc80fbe61..937f16bedc0f 100644
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id$
+# $FreeBSD$
 
 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 86bdd742a8a5..8d586b5d2a60 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.10 1998/01/03 14:13:48 wosch Exp $
+# $FreeBSD$
 
 # 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/termcap.5 b/share/termcap/termcap.5
index 5cb8044a08c7..c713ab91cc48 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -51,7 +51,7 @@
 .\" *                                                                          *
 .\" ***************************************************************************/
 .\"
-.\"	$Id: termcap.5,v 1.8 1998/06/10 12:34:27 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt TERMCAP 5
diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index 8d989a929a26..fcf41e4099d7 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
-#	$Id: termcap.src,v 1.83 1998/05/21 09:10:55 jkoshy Exp $
+# $FreeBSD$
 
 #	Termcap source file
 #	John Kunze, Berkeley
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 184e933de6e4..da947e9129e8 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 SUBDIR = data
 
diff --git a/share/timedef/da_DK.ISO8859-1.src b/share/timedef/da_DK.ISO8859-1.src
index 5a462af33193..9b20264403d3 100644
--- a/share/timedef/da_DK.ISO8859-1.src
+++ b/share/timedef/da_DK.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/da_DK.ISO_8859-1.src b/share/timedef/da_DK.ISO_8859-1.src
index 5a462af33193..9b20264403d3 100644
--- a/share/timedef/da_DK.ISO_8859-1.src
+++ b/share/timedef/da_DK.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/Makefile b/share/timedef/data/Makefile
index 7bd8bb8b2b95..2057b51c78a1 100644
--- a/share/timedef/data/Makefile
+++ b/share/timedef/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.31 1999/06/05 03:04:03 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/timedef/data/da_DK.ISO_8859-1.src b/share/timedef/data/da_DK.ISO_8859-1.src
index 5a462af33193..9b20264403d3 100644
--- a/share/timedef/data/da_DK.ISO_8859-1.src
+++ b/share/timedef/data/da_DK.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/de_AT.ISO_8859-1.src b/share/timedef/data/de_AT.ISO_8859-1.src
index c2b279a4d625..a54e69c8af5d 100644
--- a/share/timedef/data/de_AT.ISO_8859-1.src
+++ b/share/timedef/data/de_AT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id: de_DE.ISO_8859-1.src,v 1.6 1997/02/22 13:56:44 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/de_DE.ISO_8859-1.src b/share/timedef/data/de_DE.ISO_8859-1.src
index e78f9c53bcaf..1911dd5c8636 100644
--- a/share/timedef/data/de_DE.ISO_8859-1.src
+++ b/share/timedef/data/de_DE.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/en_GB.ISO_8859-1.src b/share/timedef/data/en_GB.ISO_8859-1.src
index b34711bbbba4..d75253801b4c 100644
--- a/share/timedef/data/en_GB.ISO_8859-1.src
+++ b/share/timedef/data/en_GB.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/en_US.ISO_8859-1.src b/share/timedef/data/en_US.ISO_8859-1.src
index 8bfd42d713b1..24f2c519ff34 100644
--- a/share/timedef/data/en_US.ISO_8859-1.src
+++ b/share/timedef/data/en_US.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/es_ES.ISO_8859-1.src b/share/timedef/data/es_ES.ISO_8859-1.src
index b8df4e5cfcdf..1eac378fe2de 100644
--- a/share/timedef/data/es_ES.ISO_8859-1.src
+++ b/share/timedef/data/es_ES.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id: es_ES.ISO_8859-1.src,v 1.1 1998/01/02 11:44:29 helbig Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/fi_FI.ISO_8859-1.src b/share/timedef/data/fi_FI.ISO_8859-1.src
index 42207ebce996..c9a1ec1fec6a 100644
--- a/share/timedef/data/fi_FI.ISO_8859-1.src
+++ b/share/timedef/data/fi_FI.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/data/fr_FR.ISO_8859-1.src b/share/timedef/data/fr_FR.ISO_8859-1.src
index 50002b4d23b6..0e649b262ef4 100644
--- a/share/timedef/data/fr_FR.ISO_8859-1.src
+++ b/share/timedef/data/fr_FR.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/hr_HR.ISO_8859-2.src b/share/timedef/data/hr_HR.ISO_8859-2.src
index 761fd1430cd6..c0842489663b 100644
--- a/share/timedef/data/hr_HR.ISO_8859-2.src
+++ b/share/timedef/data/hr_HR.ISO_8859-2.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/is_IS.ISO_8859-1.src b/share/timedef/data/is_IS.ISO_8859-1.src
index 4572130abb79..5ae39bc965d5 100644
--- a/share/timedef/data/is_IS.ISO_8859-1.src
+++ b/share/timedef/data/is_IS.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/it_IT.ISO_8859-1.src b/share/timedef/data/it_IT.ISO_8859-1.src
index d6edb47aa391..c95629473aa0 100644
--- a/share/timedef/data/it_IT.ISO_8859-1.src
+++ b/share/timedef/data/it_IT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id: it_IT.ISO_8859-1.src,v 1.3 1997/02/22 13:56:46 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ja_JP.EUC.src b/share/timedef/data/ja_JP.EUC.src
index a71887833994..019ec4f136c5 100644
--- a/share/timedef/data/ja_JP.EUC.src
+++ b/share/timedef/data/ja_JP.EUC.src
@@ -1,4 +1,4 @@
-# $Id: ja_JP.SJIS.src,v 1.3 1997/09/19 00:56:49 julian Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ja_JP.SJIS.src b/share/timedef/data/ja_JP.SJIS.src
index 59a79212e7e1..9a6559beebb2 100644
--- a/share/timedef/data/ja_JP.SJIS.src
+++ b/share/timedef/data/ja_JP.SJIS.src
@@ -1,4 +1,4 @@
-# $Id: ja_JP.SJIS.src,v 1.2 1997/09/19 00:51:52 julian Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ko_KR.EUC.src b/share/timedef/data/ko_KR.EUC.src
index eb5f45f7f0f1..65fed23993f5 100644
--- a/share/timedef/data/ko_KR.EUC.src
+++ b/share/timedef/data/ko_KR.EUC.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # Choi Jun Ho <jazz.snu.ac.kr>
 # 27 Mar 1997
diff --git a/share/timedef/data/lt_LN.ISO_8859-1.src b/share/timedef/data/lt_LN.ISO_8859-1.src
index e31decedb2d7..e583885b0d8a 100644
--- a/share/timedef/data/lt_LN.ISO_8859-1.src
+++ b/share/timedef/data/lt_LN.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # This is Latin. The week with seven days was introduced in the
 # Roman Empire 321 AD. (Konstantin I)
 #
diff --git a/share/timedef/data/nl_NL.ISO_8859-1.src b/share/timedef/data/nl_NL.ISO_8859-1.src
index 05e8ea4b3e13..57bcb1b3a05f 100644
--- a/share/timedef/data/nl_NL.ISO_8859-1.src
+++ b/share/timedef/data/nl_NL.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/no_NO.ISO_8859-1.src b/share/timedef/data/no_NO.ISO_8859-1.src
index 153f6da2d046..faea620bcba3 100644
--- a/share/timedef/data/no_NO.ISO_8859-1.src
+++ b/share/timedef/data/no_NO.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id: no_NO.ISO_8859-1.src,v 1.4 1998/05/25 18:51:47 steve Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/pt_PT.ISO_8859-1.src b/share/timedef/data/pt_PT.ISO_8859-1.src
index 1d4b946f4f5e..355033fb3ac6 100644
--- a/share/timedef/data/pt_PT.ISO_8859-1.src
+++ b/share/timedef/data/pt_PT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ru_SU.CP866.src b/share/timedef/data/ru_SU.CP866.src
index 967791f51db8..40c3d483cc12 100644
--- a/share/timedef/data/ru_SU.CP866.src
+++ b/share/timedef/data/ru_SU.CP866.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/ru_SU.KOI8-R.src b/share/timedef/data/ru_SU.KOI8-R.src
index f97d92d3e2a0..d308d02b5167 100644
--- a/share/timedef/data/ru_SU.KOI8-R.src
+++ b/share/timedef/data/ru_SU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/sl_SI.ISO_8859-2.src b/share/timedef/data/sl_SI.ISO_8859-2.src
index 2d4121c5dc2f..874996ce8489 100644
--- a/share/timedef/data/sl_SI.ISO_8859-2.src
+++ b/share/timedef/data/sl_SI.ISO_8859-2.src
@@ -1,4 +1,4 @@
-# $Id: $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/sv_SE.ISO_8859-1.src b/share/timedef/data/sv_SE.ISO_8859-1.src
index e3880ca6ad66..7778f1a48946 100644
--- a/share/timedef/data/sv_SE.ISO_8859-1.src
+++ b/share/timedef/data/sv_SE.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/data/zh_CN.EUC.src b/share/timedef/data/zh_CN.EUC.src
index 0590f7f8dac9..22c0975db769 100644
--- a/share/timedef/data/zh_CN.EUC.src
+++ b/share/timedef/data/zh_CN.EUC.src
@@ -1,4 +1,4 @@
-# $Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/data/zh_TW.Big5.src b/share/timedef/data/zh_TW.Big5.src
index faed3c60ebef..b0e0cc572816 100644
--- a/share/timedef/data/zh_TW.Big5.src
+++ b/share/timedef/data/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $Id: zh_TW.BIG5.src,v 1.3 1999/04/28 07:27:04 foxfair Exp $
+# $FreeBSD$
 #
 # 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 c2b279a4d625..a54e69c8af5d 100644
--- a/share/timedef/de_AT.ISO8859-1.src
+++ b/share/timedef/de_AT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id: de_DE.ISO_8859-1.src,v 1.6 1997/02/22 13:56:44 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_AT.ISO_8859-1.src b/share/timedef/de_AT.ISO_8859-1.src
index c2b279a4d625..a54e69c8af5d 100644
--- a/share/timedef/de_AT.ISO_8859-1.src
+++ b/share/timedef/de_AT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id: de_DE.ISO_8859-1.src,v 1.6 1997/02/22 13:56:44 peter Exp $
+# $FreeBSD$
 #
 # 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 e78f9c53bcaf..1911dd5c8636 100644
--- a/share/timedef/de_DE.ISO8859-1.src
+++ b/share/timedef/de_DE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/de_DE.ISO_8859-1.src b/share/timedef/de_DE.ISO_8859-1.src
index e78f9c53bcaf..1911dd5c8636 100644
--- a/share/timedef/de_DE.ISO_8859-1.src
+++ b/share/timedef/de_DE.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # 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 b34711bbbba4..d75253801b4c 100644
--- a/share/timedef/en_GB.ISO8859-1.src
+++ b/share/timedef/en_GB.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/en_GB.ISO_8859-1.src b/share/timedef/en_GB.ISO_8859-1.src
index b34711bbbba4..d75253801b4c 100644
--- a/share/timedef/en_GB.ISO_8859-1.src
+++ b/share/timedef/en_GB.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # 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 8bfd42d713b1..24f2c519ff34 100644
--- a/share/timedef/en_US.ISO8859-1.src
+++ b/share/timedef/en_US.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/en_US.ISO_8859-1.src b/share/timedef/en_US.ISO_8859-1.src
index 8bfd42d713b1..24f2c519ff34 100644
--- a/share/timedef/en_US.ISO_8859-1.src
+++ b/share/timedef/en_US.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # 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 b8df4e5cfcdf..1eac378fe2de 100644
--- a/share/timedef/es_ES.ISO8859-1.src
+++ b/share/timedef/es_ES.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id: es_ES.ISO_8859-1.src,v 1.1 1998/01/02 11:44:29 helbig Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/es_ES.ISO_8859-1.src b/share/timedef/es_ES.ISO_8859-1.src
index b8df4e5cfcdf..1eac378fe2de 100644
--- a/share/timedef/es_ES.ISO_8859-1.src
+++ b/share/timedef/es_ES.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id: es_ES.ISO_8859-1.src,v 1.1 1998/01/02 11:44:29 helbig Exp $
+# $FreeBSD$
 #
 # 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 42207ebce996..c9a1ec1fec6a 100644
--- a/share/timedef/fi_FI.ISO8859-1.src
+++ b/share/timedef/fi_FI.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/fi_FI.ISO_8859-1.src b/share/timedef/fi_FI.ISO_8859-1.src
index 42207ebce996..c9a1ec1fec6a 100644
--- a/share/timedef/fi_FI.ISO_8859-1.src
+++ b/share/timedef/fi_FI.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # 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 50002b4d23b6..0e649b262ef4 100644
--- a/share/timedef/fr_FR.ISO8859-1.src
+++ b/share/timedef/fr_FR.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/fr_FR.ISO_8859-1.src b/share/timedef/fr_FR.ISO_8859-1.src
index 50002b4d23b6..0e649b262ef4 100644
--- a/share/timedef/fr_FR.ISO_8859-1.src
+++ b/share/timedef/fr_FR.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # 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 761fd1430cd6..c0842489663b 100644
--- a/share/timedef/hr_HR.ISO8859-2.src
+++ b/share/timedef/hr_HR.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/hr_HR.ISO_8859-2.src b/share/timedef/hr_HR.ISO_8859-2.src
index 761fd1430cd6..c0842489663b 100644
--- a/share/timedef/hr_HR.ISO_8859-2.src
+++ b/share/timedef/hr_HR.ISO_8859-2.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/is_IS.ISO8859-1.src b/share/timedef/is_IS.ISO8859-1.src
index 4572130abb79..5ae39bc965d5 100644
--- a/share/timedef/is_IS.ISO8859-1.src
+++ b/share/timedef/is_IS.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/is_IS.ISO_8859-1.src b/share/timedef/is_IS.ISO_8859-1.src
index 4572130abb79..5ae39bc965d5 100644
--- a/share/timedef/is_IS.ISO_8859-1.src
+++ b/share/timedef/is_IS.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # 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 d6edb47aa391..c95629473aa0 100644
--- a/share/timedef/it_IT.ISO8859-1.src
+++ b/share/timedef/it_IT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id: it_IT.ISO_8859-1.src,v 1.3 1997/02/22 13:56:46 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/it_IT.ISO_8859-1.src b/share/timedef/it_IT.ISO_8859-1.src
index d6edb47aa391..c95629473aa0 100644
--- a/share/timedef/it_IT.ISO_8859-1.src
+++ b/share/timedef/it_IT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id: it_IT.ISO_8859-1.src,v 1.3 1997/02/22 13:56:46 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ja_JP.EUC.src b/share/timedef/ja_JP.EUC.src
index a71887833994..019ec4f136c5 100644
--- a/share/timedef/ja_JP.EUC.src
+++ b/share/timedef/ja_JP.EUC.src
@@ -1,4 +1,4 @@
-# $Id: ja_JP.SJIS.src,v 1.3 1997/09/19 00:56:49 julian Exp $
+# $FreeBSD$
 #
 # 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 59a79212e7e1..9a6559beebb2 100644
--- a/share/timedef/ja_JP.SJIS.src
+++ b/share/timedef/ja_JP.SJIS.src
@@ -1,4 +1,4 @@
-# $Id: ja_JP.SJIS.src,v 1.2 1997/09/19 00:51:52 julian Exp $
+# $FreeBSD$
 #
 # 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 a71887833994..019ec4f136c5 100644
--- a/share/timedef/ja_JP.eucJP.src
+++ b/share/timedef/ja_JP.eucJP.src
@@ -1,4 +1,4 @@
-# $Id: ja_JP.SJIS.src,v 1.3 1997/09/19 00:56:49 julian Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ko_KR.EUC.src b/share/timedef/ko_KR.EUC.src
index eb5f45f7f0f1..65fed23993f5 100644
--- a/share/timedef/ko_KR.EUC.src
+++ b/share/timedef/ko_KR.EUC.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # Choi Jun Ho <jazz.snu.ac.kr>
 # 27 Mar 1997
diff --git a/share/timedef/ko_KR.eucKR.src b/share/timedef/ko_KR.eucKR.src
index eb5f45f7f0f1..65fed23993f5 100644
--- a/share/timedef/ko_KR.eucKR.src
+++ b/share/timedef/ko_KR.eucKR.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # Choi Jun Ho <jazz.snu.ac.kr>
 # 27 Mar 1997
diff --git a/share/timedef/la_LN.ISO8859-1.src b/share/timedef/la_LN.ISO8859-1.src
index e31decedb2d7..e583885b0d8a 100644
--- a/share/timedef/la_LN.ISO8859-1.src
+++ b/share/timedef/la_LN.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # This is Latin. The week with seven days was introduced in the
 # Roman Empire 321 AD. (Konstantin I)
 #
diff --git a/share/timedef/la_LN.ISO_8859-1.src b/share/timedef/la_LN.ISO_8859-1.src
index e31decedb2d7..e583885b0d8a 100644
--- a/share/timedef/la_LN.ISO_8859-1.src
+++ b/share/timedef/la_LN.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # This is Latin. The week with seven days was introduced in the
 # Roman Empire 321 AD. (Konstantin I)
 #
diff --git a/share/timedef/lt_LN.ISO_8859-1.src b/share/timedef/lt_LN.ISO_8859-1.src
index e31decedb2d7..e583885b0d8a 100644
--- a/share/timedef/lt_LN.ISO_8859-1.src
+++ b/share/timedef/lt_LN.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # This is Latin. The week with seven days was introduced in the
 # Roman Empire 321 AD. (Konstantin I)
 #
diff --git a/share/timedef/nl_NL.ISO8859-1.src b/share/timedef/nl_NL.ISO8859-1.src
index 05e8ea4b3e13..57bcb1b3a05f 100644
--- a/share/timedef/nl_NL.ISO8859-1.src
+++ b/share/timedef/nl_NL.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/nl_NL.ISO_8859-1.src b/share/timedef/nl_NL.ISO_8859-1.src
index 05e8ea4b3e13..57bcb1b3a05f 100644
--- a/share/timedef/nl_NL.ISO_8859-1.src
+++ b/share/timedef/nl_NL.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # 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 153f6da2d046..faea620bcba3 100644
--- a/share/timedef/no_NO.ISO8859-1.src
+++ b/share/timedef/no_NO.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id: no_NO.ISO_8859-1.src,v 1.4 1998/05/25 18:51:47 steve Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/no_NO.ISO_8859-1.src b/share/timedef/no_NO.ISO_8859-1.src
index 153f6da2d046..faea620bcba3 100644
--- a/share/timedef/no_NO.ISO_8859-1.src
+++ b/share/timedef/no_NO.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id: no_NO.ISO_8859-1.src,v 1.4 1998/05/25 18:51:47 steve Exp $
+# $FreeBSD$
 #
 # 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 1d4b946f4f5e..355033fb3ac6 100644
--- a/share/timedef/pt_PT.ISO8859-1.src
+++ b/share/timedef/pt_PT.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/pt_PT.ISO_8859-1.src b/share/timedef/pt_PT.ISO_8859-1.src
index 1d4b946f4f5e..355033fb3ac6 100644
--- a/share/timedef/pt_PT.ISO_8859-1.src
+++ b/share/timedef/pt_PT.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 #
 # 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 967791f51db8..40c3d483cc12 100644
--- a/share/timedef/ru_RU.CP866.src
+++ b/share/timedef/ru_RU.CP866.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # 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 f97d92d3e2a0..d308d02b5167 100644
--- a/share/timedef/ru_RU.KOI8-R.src
+++ b/share/timedef/ru_RU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_SU.CP866.src b/share/timedef/ru_SU.CP866.src
index 967791f51db8..40c3d483cc12 100644
--- a/share/timedef/ru_SU.CP866.src
+++ b/share/timedef/ru_SU.CP866.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/ru_SU.KOI8-R.src b/share/timedef/ru_SU.KOI8-R.src
index f97d92d3e2a0..d308d02b5167 100644
--- a/share/timedef/ru_SU.KOI8-R.src
+++ b/share/timedef/ru_SU.KOI8-R.src
@@ -1,4 +1,4 @@
-# $Id: ru_SU.KOI8-R.src,v 1.7 1997/02/22 13:56:47 peter Exp $
+# $FreeBSD$
 #
 # 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 2d4121c5dc2f..874996ce8489 100644
--- a/share/timedef/sl_SI.ISO8859-2.src
+++ b/share/timedef/sl_SI.ISO8859-2.src
@@ -1,4 +1,4 @@
-# $Id: $
+# $FreeBSD$
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
diff --git a/share/timedef/sl_SI.ISO_8859-2.src b/share/timedef/sl_SI.ISO_8859-2.src
index 2d4121c5dc2f..874996ce8489 100644
--- a/share/timedef/sl_SI.ISO_8859-2.src
+++ b/share/timedef/sl_SI.ISO_8859-2.src
@@ -1,4 +1,4 @@
-# $Id: $
+# $FreeBSD$
 #
 # 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 e3880ca6ad66..7778f1a48946 100644
--- a/share/timedef/sv_SE.ISO8859-1.src
+++ b/share/timedef/sv_SE.ISO8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/sv_SE.ISO_8859-1.src b/share/timedef/sv_SE.ISO_8859-1.src
index e3880ca6ad66..7778f1a48946 100644
--- a/share/timedef/sv_SE.ISO_8859-1.src
+++ b/share/timedef/sv_SE.ISO_8859-1.src
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
diff --git a/share/timedef/zh_CN.EUC.src b/share/timedef/zh_CN.EUC.src
index 0590f7f8dac9..22c0975db769 100644
--- a/share/timedef/zh_CN.EUC.src
+++ b/share/timedef/zh_CN.EUC.src
@@ -1,4 +1,4 @@
-# $Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+# $FreeBSD$
 #
 # 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 0590f7f8dac9..22c0975db769 100644
--- a/share/timedef/zh_CN.eucCN.src
+++ b/share/timedef/zh_CN.eucCN.src
@@ -1,4 +1,4 @@
-# $Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+# $FreeBSD$
 #
 # 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 faed3c60ebef..b0e0cc572816 100644
--- a/share/timedef/zh_TW.Big5.src
+++ b/share/timedef/zh_TW.Big5.src
@@ -1,4 +1,4 @@
-# $Id: zh_TW.BIG5.src,v 1.3 1999/04/28 07:27:04 foxfair Exp $
+# $FreeBSD$
 #
 # 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 569b0cb8e8fb..670f4fef32a2 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1997/02/22 13:56:50 peter Exp $
+# $FreeBSD$
 
 CLEANFILES+=	yearistype
 
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 16b4f74849c7..b4bd9deb6966 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.kern.mk,v 1.14 1999/01/29 06:22:19 dillon Exp $
+# $FreeBSD$
 
 #
 # Warning flags for compiling the kernel and components of the kernel.
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index be04cca23164..02a7a73acce5 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
-#	$Id: bsd.kmod.mk,v 1.61 1999/04/23 20:53:34 peter Exp $
+# $FreeBSD$
 #
 # The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
 #
diff --git a/sys/netinet/libalias/Makefile b/sys/netinet/libalias/Makefile
index 2a7666135535..e5406486a8e3 100644
--- a/sys/netinet/libalias/Makefile
+++ b/sys/netinet/libalias/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1999/02/27 02:16:01 brian Exp $
+# $FreeBSD$
 
 LIB=		alias
 SHLIB_MAJOR=	3
diff --git a/sys/netinet/libalias/alias.h b/sys/netinet/libalias/alias.h
index d3c2fd45c474..9666b0fb12be 100644
--- a/sys/netinet/libalias/alias.h
+++ b/sys/netinet/libalias/alias.h
@@ -7,7 +7,7 @@
     This software is placed into the public domain with no restrictions
     on its distribution.
 
-    $Id: alias.h,v 1.9 1999/02/27 02:16:01 brian Exp $
+ $FreeBSD$
 */
 
 
diff --git a/sys/netinet/libalias/alias_cuseeme.c b/sys/netinet/libalias/alias_cuseeme.c
index 7cb6d4ea4ee4..b1b95f49e0d4 100644
--- a/sys/netinet/libalias/alias_cuseeme.c
+++ b/sys/netinet/libalias/alias_cuseeme.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c
index 8b6e18012d58..b5afedf1ab56 100644
--- a/sys/netinet/libalias/alias_nbt.c
+++ b/sys/netinet/libalias/alias_nbt.c
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: alias_nbt.c,v 1.2 1998/12/14 02:25:32 dillon Exp $
+ * $FreeBSD$
  *
  *  TODO:
  *       oClean up. 
diff --git a/sys/netinet/libalias/libalias.3 b/sys/netinet/libalias/libalias.3
index ac252a682283..d57aa650b004 100644
--- a/sys/netinet/libalias/libalias.3
+++ b/sys/netinet/libalias/libalias.3
@@ -1,4 +1,4 @@
-.\" $Id: libalias.3,v 1.15 1999/08/15 09:50:59 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd July, 1997
 .Dt LIBALIAS 3 
diff --git a/usr.sbin/mount_portalfs/Makefile b/usr.sbin/mount_portalfs/Makefile
index 7734df49eee6..23a5bd771be8 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
-#	$Id: Makefile,v 1.8 1998/01/20 10:40:04 bde Exp $
+# $FreeBSD$
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/usr.sbin/mount_portalfs/activate.c b/usr.sbin/mount_portalfs/activate.c
index 6eb0c582753a..56464981471c 100644
--- a/usr.sbin/mount_portalfs/activate.c
+++ b/usr.sbin/mount_portalfs/activate.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: activate.c,v 1.5 1998/07/06 07:19:23 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/mount_portalfs/conf.c b/usr.sbin/mount_portalfs/conf.c
index 373e62d6fb47..d5833e4b2136 100644
--- a/usr.sbin/mount_portalfs/conf.c
+++ b/usr.sbin/mount_portalfs/conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: conf.c,v 1.6 1998/07/06 07:19:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.8 b/usr.sbin/mount_portalfs/mount_portalfs.8
index 68183392eb3b..afaa3d7175f5 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.8
+++ b/usr.sbin/mount_portalfs/mount_portalfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\"	$Id: mount_portal.8,v 1.5 1999/08/06 04:19:27 dwhite Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index 6de71ea947e7..c0b1852a44b3 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
 #endif
 static const char rcsid[] =
-	"$Id: mount_portal.c,v 1.13 1998/07/06 07:19:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mount_portalfs/pathnames.h b/usr.sbin/mount_portalfs/pathnames.h
index 3203b00c1483..6b557704e38f 100644
--- a/usr.sbin/mount_portalfs/pathnames.h
+++ b/usr.sbin/mount_portalfs/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/usr.sbin/mount_portalfs/portal.conf b/usr.sbin/mount_portalfs/portal.conf
index 3a4ddf0a1a9b..53a07a92231c 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
-# $Id$
+# $FreeBSD$
 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 f01e8a88ca78..4131834c5575 100644
--- a/usr.sbin/mount_portalfs/portald.h
+++ b/usr.sbin/mount_portalfs/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $Id: portald.h,v 1.3 1997/02/22 14:32:55 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/mount_portalfs/pt_conf.c b/usr.sbin/mount_portalfs/pt_conf.c
index 11088ea2934d..f158a73dd03d 100644
--- a/usr.sbin/mount_portalfs/pt_conf.c
+++ b/usr.sbin/mount_portalfs/pt_conf.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: pt_conf.c,v 1.4 1998/07/06 07:19:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mount_portalfs/pt_exec.c b/usr.sbin/mount_portalfs/pt_exec.c
index 6ee326d50a00..359c78e92164 100644
--- a/usr.sbin/mount_portalfs/pt_exec.c
+++ b/usr.sbin/mount_portalfs/pt_exec.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/mount_portalfs/pt_file.c b/usr.sbin/mount_portalfs/pt_file.c
index 32207f31931e..f22ebd7d2b51 100644
--- a/usr.sbin/mount_portalfs/pt_file.c
+++ b/usr.sbin/mount_portalfs/pt_file.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcp.c b/usr.sbin/mount_portalfs/pt_tcp.c
index 954388ee03fd..49056163aae3 100644
--- a/usr.sbin/mount_portalfs/pt_tcp.c
+++ b/usr.sbin/mount_portalfs/pt_tcp.c
@@ -39,7 +39,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: pt_tcp.c,v 1.7 1998/07/06 07:19:27 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index 6a2097a91afe..0312e9b657e2 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-#	$Id: Makefile,v 1.7 1997/03/11 12:43:42 peter Exp $
+# $FreeBSD$
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5
index 9239440f3def..9a148dea0304 100644
--- a/usr.sbin/mountd/exports.5
+++ b/usr.sbin/mountd/exports.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
-.\"	$Id: exports.5,v 1.7 1998/07/15 06:21:37 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8
index 43a4cd3e38da..98397f5a33f0 100644
--- a/usr.sbin/mountd/mountd.8
+++ b/usr.sbin/mountd/mountd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\"	$Id: mountd.8,v 1.14 1998/10/15 13:37:35 mckay Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt MOUNTD 8
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index 170655b01caf..cc5e572d137c 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mountd.c	8.15 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: mountd.c,v 1.34 1998/12/29 09:38:49 dfr Exp $";
+  "$FreeBSD$";
 #endif /*not lint*/
 
 #include <sys/param.h>
diff --git a/usr.sbin/mountd/netgroup.5 b/usr.sbin/mountd/netgroup.5
index f57aa2914941..8e2bf44265e6 100644
--- a/usr.sbin/mountd/netgroup.5
+++ b/usr.sbin/mountd/netgroup.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netgroup.5	8.2 (Berkeley) 12/11/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt NETGROUP 5
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index f82cfe5b8bc1..e3d3e1cead65 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 29, 1995
 .Dt NFSD 8
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index e1a1ffe2e54e..ca7ecefa482e 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nfsd.c	8.9 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif not lint
 
 #include <sys/param.h>
diff --git a/usr.sbin/nologin/nologin.5 b/usr.sbin/nologin/nologin.5
index 37d311ab5c94..8ce22a264715 100644
--- a/usr.sbin/nologin/nologin.5
+++ b/usr.sbin/nologin/nologin.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\"	$Id: nologin.5,v 1.5 1999/01/12 14:09:23 asami Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 5
diff --git a/usr.sbin/nologin/nologin.8 b/usr.sbin/nologin/nologin.8
index 4e7bf61aacb5..d5f4cb7a5f0b 100644
--- a/usr.sbin/nologin/nologin.8
+++ b/usr.sbin/nologin/nologin.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\"	$Id: nologin.8,v 1.2 1998/07/15 06:37:07 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
diff --git a/usr.sbin/nologin/nologin.sh b/usr.sbin/nologin/nologin.sh
index 346836f63918..52279c19ea9a 100644
--- a/usr.sbin/nologin/nologin.sh
+++ b/usr.sbin/nologin/nologin.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nologin.sh	8.1 (Berkeley) 6/5/93
-#	$Id$
+# $FreeBSD$
 #
 
 echo 'This account is currently not available.'