diff --git a/lib/libmemstat/memstat.h b/lib/libmemstat/memstat.h
index 5267e78aa05..e973f1a52db 100644
--- a/lib/libmemstat/memstat.h
+++ b/lib/libmemstat/memstat.h
@@ -31,7 +31,7 @@
 
 /*
  * Number of CPU slots in library-internal data structures.  This should be
- * at least value of MAXCPU from param.h
+ * at least the value of MAXCPU from param.h.
  */
 #define	MEMSTAT_MAXCPU	32
 
diff --git a/tools/build/options/WITHOUT_GPIO b/tools/build/options/WITHOUT_GPIO
index 08c565d7698..0b1d091470d 100644
--- a/tools/build/options/WITHOUT_GPIO
+++ b/tools/build/options/WITHOUT_GPIO
@@ -1,4 +1,4 @@
-.\" $FreeBSD: head/tools/build/options/WITHOUT_GPIO 221541 2011-05-06 19:14:06Z ru $
+.\" $FreeBSD$
 Set to not build
 .Xr gpioctl 8
 as part of the base system.
diff --git a/tools/regression/bin/sh/parser/dollar-quote1.0 b/tools/regression/bin/sh/parser/dollar-quote1.0
index 2554eedca8a..12061417e10 100644
--- a/tools/regression/bin/sh/parser/dollar-quote1.0
+++ b/tools/regression/bin/sh/parser/dollar-quote1.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote1.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 set -e
 
diff --git a/tools/regression/bin/sh/parser/dollar-quote2.0 b/tools/regression/bin/sh/parser/dollar-quote2.0
index 0e959338d68..4617ed8d908 100644
--- a/tools/regression/bin/sh/parser/dollar-quote2.0
+++ b/tools/regression/bin/sh/parser/dollar-quote2.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote2.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 # This depends on the ASCII character set.
 
diff --git a/tools/regression/bin/sh/parser/dollar-quote3.0 b/tools/regression/bin/sh/parser/dollar-quote3.0
index 7c0f9663cb3..a7e68527791 100644
--- a/tools/regression/bin/sh/parser/dollar-quote3.0
+++ b/tools/regression/bin/sh/parser/dollar-quote3.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote3.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 unset LC_ALL
 LC_CTYPE=en_US.ISO8859-1
diff --git a/tools/regression/bin/sh/parser/dollar-quote4.0 b/tools/regression/bin/sh/parser/dollar-quote4.0
index 6403ad9f37f..f620af5b12c 100644
--- a/tools/regression/bin/sh/parser/dollar-quote4.0
+++ b/tools/regression/bin/sh/parser/dollar-quote4.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote4.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 unset LC_ALL
 LC_CTYPE=en_US.ISO8859-1
diff --git a/tools/regression/bin/sh/parser/dollar-quote5.0 b/tools/regression/bin/sh/parser/dollar-quote5.0
index b5e20a4c5d8..c2c44ca620e 100644
--- a/tools/regression/bin/sh/parser/dollar-quote5.0
+++ b/tools/regression/bin/sh/parser/dollar-quote5.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote5.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 # This depends on the ASCII character set.
 
diff --git a/tools/regression/bin/sh/parser/dollar-quote6.0 b/tools/regression/bin/sh/parser/dollar-quote6.0
index 92046137a15..a4b1e3f4872 100644
--- a/tools/regression/bin/sh/parser/dollar-quote6.0
+++ b/tools/regression/bin/sh/parser/dollar-quote6.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote6.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 # This depends on the ASCII character set.
 
diff --git a/tools/regression/bin/sh/parser/dollar-quote7.0 b/tools/regression/bin/sh/parser/dollar-quote7.0
index 9c6bd39030b..c866b1af68b 100644
--- a/tools/regression/bin/sh/parser/dollar-quote7.0
+++ b/tools/regression/bin/sh/parser/dollar-quote7.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote7.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 set -e
 
diff --git a/tools/regression/bin/sh/parser/dollar-quote8.0 b/tools/regression/bin/sh/parser/dollar-quote8.0
index de9161437cf..8f0b41a0a3f 100644
--- a/tools/regression/bin/sh/parser/dollar-quote8.0
+++ b/tools/regression/bin/sh/parser/dollar-quote8.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote8.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 [ $'hello\0' = hello ]
 [ $'hello\0world' = hello ]
diff --git a/tools/regression/bin/sh/parser/dollar-quote9.0 b/tools/regression/bin/sh/parser/dollar-quote9.0
index 8a4ea9f21d9..df64b7dfc0b 100644
--- a/tools/regression/bin/sh/parser/dollar-quote9.0
+++ b/tools/regression/bin/sh/parser/dollar-quote9.0
@@ -1,4 +1,4 @@
-# $FreeBSD: head/tools/regression/bin/sh/parser/dollar-quote9.0 221513 2011-05-05 20:55:55Z jilles $
+# $FreeBSD$
 
 # POSIX and C99 say D800-DFFF are undefined in a universal character name.
 # We reject this but many other shells expand to something that looks like