diff --git a/bin/named/query.c b/bin/named/query.c
index 6bae511641f50ea88d21e5e5187fada5d591bdbf..9d27592407c4d862de99954b65d3129e7af48fa8 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.384 2012/02/07 01:07:47 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 6921feb5c9c1cc4db127b593fe0dffa456e1f08c..7c791f7b415c128d834b744089a189106029c45c 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.647 2012/02/23 06:53:15 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 626efc1822f85a8886fbde3b76b653c2ec0f22bd..5bac27373f94a8780456c92796a61e1ac8fe4dff 100644
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz_dlopen_driver.c,v 1.8 2012/02/22 23:47:34 tbox Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 70b7830541de4ca3fd4cc586153ff9fbb32784a2..1f2d5b0c2273f387babda1d8278cf9f80f45fd08 100644
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.144 2011/12/22 07:32:40 each Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 748d1142290b15af150cf1c1a57345cfb6b43483..be81a80ceda40c072746052a61277391311f8f94 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.189 2012/02/23 06:53:15 marka Exp $ */
+/* $Id$ */
 
 /*% */
 
diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index 85c7cb8d5e4227cb25ca376d33606eb86cb843d0..960bddb1dace4fc8aae37595bf89ad8abaf67e93 100644
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.8 2011/11/07 00:14:11 marka Exp $
+# $Id$
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dlzexternal/driver.c b/bin/tests/system/dlzexternal/driver.c
index bbc9b5fe2175d31677c105838443770bc290745c..0854327b848a2d393eefca6ec0567699fe0bd6b6 100644
--- a/bin/tests/system/dlzexternal/driver.c
+++ b/bin/tests/system/dlzexternal/driver.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: driver.c,v 1.9 2011/11/30 00:48:51 marka Exp $ */
+/* $Id$ */
 
 /*
  * This provides a very simple example of an external loadable DLZ
diff --git a/contrib/dlz/example/dlz_example.c b/contrib/dlz/example/dlz_example.c
index 0c44e64af436ab8d3c16f3e5bfa48394437a1313..66d3545f107dcc7abdd9a8aa4efa7aed7ae6284c 100644
--- a/contrib/dlz/example/dlz_example.c
+++ b/contrib/dlz/example/dlz_example.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz_example.c,v 1.3 2011/10/20 22:01:48 each Exp $ */
+/* $Id$ */
 
 /*
  * This provides a very simple example of an external loadable DLZ
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index b2ec4499c07339abd357c6d975af3eac8a736934..e506ad32238b4e498cf1d2dbaa2d565a187f0bb0 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.139 2011/11/30 04:27:17 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c
index ba7d4230e3d88d758be92f5f01a1fd716236b7de..9333728d639436cebe1142283209212c9d3d5a4e 100644
--- a/lib/dns/dlz.c
+++ b/lib/dns/dlz.c
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz.c,v 1.12 2011/03/12 04:59:47 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h
index 43de0740d3c5b8acf9777ac86fd025c34521208d..df610614e15522093b43a48ccf6180c793e72c8d 100644
--- a/lib/dns/include/dns/dlz.h
+++ b/lib/dns/include/dns/dlz.h
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz.h,v 1.14 2011/03/17 23:47:30 tbox Exp $ */
+/* $Id$ */
 
 /*! \file dns/dlz.h */
 
diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h
index c101a56919e1f001dbb2705cc1ed89338924e195..7ddd2b500360207290c655fc1359215bf6c90814 100644
--- a/lib/dns/include/dns/dlz_dlopen.h
+++ b/lib/dns/include/dns/dlz_dlopen.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz_dlopen.h,v 1.4 2011/10/11 23:46:45 tbox Exp $ */
+/* $Id$ */
 
 /*! \file dns/dlz_open.h */
 
diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index 1e2baaed4cb06e4dca5128742ebe78e146348a00..a03920e1962ffa6f9ea11507439c86d0f7841981 100644
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.h,v 1.17 2011/10/11 00:09:03 each Exp $ */
+/* $Id$ */
 
 /*! \file dns/sdlz.h */
 
diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index caa334757d54315e899a29d97323053920d96e98..932305f0b214188de3dbf0277935bebf4e41f463 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.146 2011/12/08 16:07:21 each Exp $ */
+/* $Id$ */
 
 #ifndef DNS_TYPES_H
 #define DNS_TYPES_H 1
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 51099d891dbda31a022973d343bf5b2a2b8d7b54..d458f07e9286bce3cf2902ce413b22b14b324023 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.h,v 1.136 2011/09/06 22:29:33 smann Exp $ */
+/* $Id$ */
 
 #ifndef DNS_VIEW_H
 #define DNS_VIEW_H 1
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 12b734ef1fefdcbbf24c07055d31ce4e7c03bd26..83196a710e96aad27ebab6e24f662f99b746e0d4 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.c,v 1.35 2011/12/22 07:15:05 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 0c6c615189098ec3005a2a1f392119f61d7300bc..e1db7f0bd06901f075b674b2426a9798b7233a15 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.c,v 1.184 2011/09/06 22:29:33 smann Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index efa188af4f83c5164aeda9d55aaaad51d7eb4fd8..873c4259c298fdec6c674ca45e3ec68e2da13123 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.675 2012/02/23 07:09:29 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 90f87a4ebcc9b1c88384d0467bc52e4cc48be3cd..873d9aa5ddd55cc52326fb7cbc2ced8980496337 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.143 2011/11/07 00:14:11 marka Exp $ */
+/* $Id$ */
 
 /*! \file */