diff --git a/admin/gkrellmd/Makefile b/admin/gkrellmd/Makefile
index 507eba577..55bd75a19 100644
--- a/admin/gkrellmd/Makefile
+++ b/admin/gkrellmd/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/admin/htop/Makefile b/admin/htop/Makefile
index ce9f20537..1b0d6894d 100644
--- a/admin/htop/Makefile
+++ b/admin/htop/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 9801efc28..724899967 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/libs/libdvbpsi4/Makefile b/libs/libdvbpsi4/Makefile
index 3fbae1f25..5ca58e57a 100644
--- a/libs/libdvbpsi4/Makefile
+++ b/libs/libdvbpsi4/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/libs/libgssapi/Makefile b/libs/libgssapi/Makefile
index 0cc06c8d4..d33e26a33 100644
--- a/libs/libgssapi/Makefile
+++ b/libs/libgssapi/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/libs/libmpcdec/Makefile b/libs/libmpcdec/Makefile
index 9b31de4ce..ab4d09023 100644
--- a/libs/libmpcdec/Makefile
+++ b/libs/libmpcdec/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/libs/libmpd/Makefile b/libs/libmpd/Makefile
index 0a27f6756..c0ecd2baa 100644
--- a/libs/libmpd/Makefile
+++ b/libs/libmpd/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 6582 2007-03-16 20:21:39Z nbd $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/libs/libnfsidmap/Makefile b/libs/libnfsidmap/Makefile
index 7c837102c..af5ca7a05 100644
--- a/libs/libnfsidmap/Makefile
+++ b/libs/libnfsidmap/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/libs/librpcsecgss/Makefile b/libs/librpcsecgss/Makefile
index 66dabda81..29cd29855 100644
--- a/libs/librpcsecgss/Makefile
+++ b/libs/librpcsecgss/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/libs/neon/Makefile b/libs/neon/Makefile
index 7c9baf512..611fe89dc 100644
--- a/libs/neon/Makefile
+++ b/libs/neon/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/aircrack-ptw/Makefile b/net/aircrack-ptw/Makefile
index b9b40b551..5f7d216ee 100644
--- a/net/aircrack-ptw/Makefile
+++ b/net/aircrack-ptw/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 6500 2007-03-04 04:19:46Z pavlov $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/asterisk-prompt-de/Makefile b/net/asterisk-prompt-de/Makefile
index b18ab0185..7a5081218 100644
--- a/net/asterisk-prompt-de/Makefile
+++ b/net/asterisk-prompt-de/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/batman/Makefile b/net/batman/Makefile
index d59fc801d..967fceddb 100644
--- a/net/batman/Makefile
+++ b/net/batman/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 6a67cc676..79f425870 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile
index 682838b99..9aa6b3d3a 100644
--- a/net/darkstat/Makefile
+++ b/net/darkstat/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/empty/Makefile b/net/empty/Makefile
index 553366f04..cd932a49c 100644
--- a/net/empty/Makefile
+++ b/net/empty/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index af74cddae..64fca66da 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/httptunnel/Makefile b/net/httptunnel/Makefile
index f4e0e6125..66d7f0ce6 100644
--- a/net/httptunnel/Makefile
+++ b/net/httptunnel/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/mvprelay/Makefile b/net/mvprelay/Makefile
index da778de48..ff1ed9386 100644
--- a/net/mvprelay/Makefile
+++ b/net/mvprelay/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index 35abb2590..0905a60e3 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index dada35bf9..01fef8df4 100644
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/nfs-utils/Makefile b/net/nfs-utils/Makefile
index 85bd046d9..e0e16e239 100644
--- a/net/nfs-utils/Makefile
+++ b/net/nfs-utils/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 6582 2007-03-16 20:21:39Z nbd $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index fbc6714e5..98ea2f31b 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/nodogsplash/Makefile b/net/nodogsplash/Makefile
index 23ecbb5bf..f8a6fab72 100644
--- a/net/nodogsplash/Makefile
+++ b/net/nodogsplash/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/nprobe/Makefile b/net/nprobe/Makefile
index 342b4a83f..5527cc15d 100644
--- a/net/nprobe/Makefile
+++ b/net/nprobe/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 6537 2007-03-07 15:46:36Z pavlov $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/pen/Makefile b/net/pen/Makefile
index fa4074418..b669412b3 100644
--- a/net/pen/Makefile
+++ b/net/pen/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 6500 2007-03-04 04:19:46Z pavlov $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/rssh/Makefile b/net/rssh/Makefile
index 2f83fb131..0cddcc239 100644
--- a/net/rssh/Makefile
+++ b/net/rssh/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index 7e485c37e..58c784170 100644
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/sshfs/Makefile b/net/sshfs/Makefile
index 29c3bea33..3e63f989c 100644
--- a/net/sshfs/Makefile
+++ b/net/sshfs/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 980dd56c7..df71e40e6 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 
 include $(TOPDIR)/rules.mk
diff --git a/net/xl2tpd/Makefile b/net/xl2tpd/Makefile
index 02862e3e0..007dc02e7 100644
--- a/net/xl2tpd/Makefile
+++ b/net/xl2tpd/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/net/xmail/Makefile b/net/xmail/Makefile
index 20904906a..03b3b14bc 100644
--- a/net/xmail/Makefile
+++ b/net/xmail/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/sound/empcd/Makefile b/sound/empcd/Makefile
index 912827be5..1027ca23b 100644
--- a/sound/empcd/Makefile
+++ b/sound/empcd/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/bash/Makefile b/utils/bash/Makefile
index e8863fecc..724950dee 100644
--- a/utils/bash/Makefile
+++ b/utils/bash/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/fortune-mod/Makefile b/utils/fortune-mod/Makefile
index 25084e453..aaee901d7 100644
--- a/utils/fortune-mod/Makefile
+++ b/utils/fortune-mod/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/io/Makefile b/utils/io/Makefile
index 21aa9d487..87db8690b 100644
--- a/utils/io/Makefile
+++ b/utils/io/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/joe/Makefile b/utils/joe/Makefile
index 7c36bdd43..892fe6d50 100644
--- a/utils/joe/Makefile
+++ b/utils/joe/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/lm-sensors/Makefile b/utils/lm-sensors/Makefile
index c7dc3925a..99eae9395 100644
--- a/utils/lm-sensors/Makefile
+++ b/utils/lm-sensors/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile
index 5faf4dfd8..85f3d8a0b 100644
--- a/utils/lsof/Makefile
+++ b/utils/lsof/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/scponly/Makefile b/utils/scponly/Makefile
index 064e9d882..c2f33196f 100644
--- a/utils/scponly/Makefile
+++ b/utils/scponly/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/unzip/Makefile b/utils/unzip/Makefile
index 43c4cdede..39196e4f4 100644
--- a/utils/unzip/Makefile
+++ b/utils/unzip/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $ 
+# $Id$ 
 
 include $(TOPDIR)/rules.mk
 
diff --git a/utils/zip/Makefile b/utils/zip/Makefile
index c2fc9b007..eafa92cc3 100644
--- a/utils/zip/Makefile
+++ b/utils/zip/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $ 
+# $Id$ 
 
 include $(TOPDIR)/rules.mk