diff --git a/README.NetBSD b/README.NetBSD
index 6bbc680b95..6e454533e5 100755
--- a/README.NetBSD
+++ b/README.NetBSD
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $QuaggaId: Format:%an, %ai, %h$ $
-
 # This file is helpful for building quagga from cvs on NetBSD, and
 # probably on any system using pkgsrc.  
 # One should have readline installed already (pkgsrc/devel/readline).
diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c
index e7272cc0aa..c9af8419f2 100644
--- a/bgpd/bgp_mpath.c
+++ b/bgpd/bgp_mpath.c
@@ -1,5 +1,4 @@
-/* $QuaggaId: Format:%an, %ai, %h$ $
- *
+/*
  * BGP Multipath
  * Copyright (C) 2010 Google Inc.
  *
diff --git a/bgpd/bgp_mpath.h b/bgpd/bgp_mpath.h
index 0a51c98d06..9a38b5943d 100644
--- a/bgpd/bgp_mpath.h
+++ b/bgpd/bgp_mpath.h
@@ -1,5 +1,4 @@
-/* $QuaggaId: Format:%an, %ai, %h$ $
- *
+/*
  * BGP Multipath
  * Copyright (C) 2010 Google Inc.
  *
diff --git a/pimd/AUTHORS b/pimd/AUTHORS
index f6135a410e..08869ff6fb 100644
--- a/pimd/AUTHORS
+++ b/pimd/AUTHORS
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 # Everton da Silva Marques <everton.marques@gmail.com>
 $ more ~/.gitconfig
 [user]
diff --git a/pimd/CAVEATS b/pimd/CAVEATS
index 9f07bda666..43dd823ae5 100644
--- a/pimd/CAVEATS
+++ b/pimd/CAVEATS
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 C1 IGMPv3 backward compatibility with IGMPv1 and IGMPv2 is not
    implemented. See RFC 3376, 7.3. Multicast Router Behavior. That's
    because only Source-Specific Multicast is currently targeted.
diff --git a/pimd/COMMANDS b/pimd/COMMANDS
index 425ac82297..c545eca56e 100644
--- a/pimd/COMMANDS
+++ b/pimd/COMMANDS
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 global configuration commands:
        pimd:
        ip multicast-routing	Enable IP multicast forwarding
diff --git a/pimd/DEBUG b/pimd/DEBUG
index 72fb8264b9..a6ad260e82 100644
--- a/pimd/DEBUG
+++ b/pimd/DEBUG
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 DEBUG HINTS
 
   - Check the source is issuing multicast packets with TTL high enough
diff --git a/pimd/LINUX_KERNEL_MROUTE_MFC b/pimd/LINUX_KERNEL_MROUTE_MFC
index e87e567f9d..3e482465f1 100644
--- a/pimd/LINUX_KERNEL_MROUTE_MFC
+++ b/pimd/LINUX_KERNEL_MROUTE_MFC
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 #
 # The Linux Kernel MFC (Multicast Forwarding Cache)
 #
diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index eba05076d5..bc28aa1e92 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in.
-## $QuaggaId: $Format:%an, %ai, %h$ $
 
 # qpimd - pimd for quagga
 # Copyright (C) 2008 Everton da Silva Marques
diff --git a/pimd/README b/pimd/README
index 1e3f72c838..c8997808b6 100644
--- a/pimd/README
+++ b/pimd/README
@@ -1,7 +1,3 @@
-#
-# $QuaggaId: $Format:%an, %ai, %h$ $
-#
-
 INTRODUCTION
 
         qpimd aims to implement a PIM (Protocol Independent Multicast)
diff --git a/pimd/TODO b/pimd/TODO
index 2308573b87..4c0f183100 100644
--- a/pimd/TODO
+++ b/pimd/TODO
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 T1 DONE Implement debug command
    test pim receive join
 
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index d3df6a1102..f09540ea00 100644
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_assert.h b/pimd/pim_assert.h
index bd3fb3e253..ec18cab85e 100644
--- a/pimd/pim_assert.h
+++ b/pimd/pim_assert.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_ASSERT_H
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 430fc738d5..3901992361 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_cmd.h b/pimd/pim_cmd.h
index 26191cd0b6..e6fbfa310c 100644
--- a/pimd/pim_cmd.h
+++ b/pimd/pim_cmd.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_CMD_H
diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c
index 21d0e5b85c..1cd44f2539 100644
--- a/pimd/pim_hello.c
+++ b/pimd/pim_hello.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_hello.h b/pimd/pim_hello.h
index b5e272d5de..3a6d3361ba 100644
--- a/pimd/pim_hello.h
+++ b/pimd/pim_hello.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_HELLO_H
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index a8a1d08805..bac9692caa 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -15,8 +15,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 790afabea1..e56559ca46 100644
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IFACE_H
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index abfa5cc2b7..7afb7a5bdf 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index e6f1c2947c..ce753222ee 100644
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IFCHANNEL_H
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 3b63b10e0d..ef1b3cbac0 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h
index c6685c2837..eb0377ce8c 100644
--- a/pimd/pim_igmp.h
+++ b/pimd/pim_igmp.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IGMP_H
diff --git a/pimd/pim_igmp_join.h b/pimd/pim_igmp_join.h
index 1700276de8..ba80db0696 100644
--- a/pimd/pim_igmp_join.h
+++ b/pimd/pim_igmp_join.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IGMP_JOIN_H
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 7300e6c6b4..bdaf2bb270 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_igmpv3.h b/pimd/pim_igmpv3.h
index bb7e92672a..db7895f9be 100644
--- a/pimd/pim_igmpv3.h
+++ b/pimd/pim_igmpv3.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IGMPV3_H
diff --git a/pimd/pim_int.c b/pimd/pim_int.c
index 208075190f..44b8386a3d 100644
--- a/pimd/pim_int.c
+++ b/pimd/pim_int.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_int.h b/pimd/pim_int.h
index d64b103277..a6349b5b3d 100644
--- a/pimd/pim_int.h
+++ b/pimd/pim_int.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_INT_H
diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 3852b423f0..6a5fb851d6 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_join.h b/pimd/pim_join.h
index 37ec0f4525..dcdca00359 100644
--- a/pimd/pim_join.h
+++ b/pimd/pim_join.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_JOIN_H
diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index 39098df526..622bef4439 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_macro.h b/pimd/pim_macro.h
index 472fa9b4e7..3079ca80cc 100644
--- a/pimd/pim_macro.h
+++ b/pimd/pim_macro.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_MACRO_H
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index aa3db3d5b2..8476964669 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 56f49d62f5..3fbed88800 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_mroute.h b/pimd/pim_mroute.h
index 176fb81cbc..f385ce09f4 100644
--- a/pimd/pim_mroute.h
+++ b/pimd/pim_mroute.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_MROUTE_H
diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c
index aa0433a2e2..9d0fc0ad8f 100644
--- a/pimd/pim_msg.c
+++ b/pimd/pim_msg.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_msg.h b/pimd/pim_msg.h
index a884fc84d9..96a89659e6 100644
--- a/pimd/pim_msg.h
+++ b/pimd/pim_msg.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_MSG_H
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index 7e7cbc0d11..04792eb35e 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h
index 5b2172dfc1..e023a7f1ef 100644
--- a/pimd/pim_neighbor.h
+++ b/pimd/pim_neighbor.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_NEIGHBOR_H
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index 96f9ef2b62..ebbc6e19f9 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h
index c63c026c0f..540acce3a3 100644
--- a/pimd/pim_oil.h
+++ b/pimd/pim_oil.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_OIL_H
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index 0dfd39cd16..0f41a43315 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_pim.h b/pimd/pim_pim.h
index 4b378fb2c3..5692a37938 100644
--- a/pimd/pim_pim.h
+++ b/pimd/pim_pim.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_PIM_H
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index 11d8464486..8d6e7b70c1 100644
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_rpf.h b/pimd/pim_rpf.h
index 72cc7ba215..4d55bd6881 100644
--- a/pimd/pim_rpf.h
+++ b/pimd/pim_rpf.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_RPF_H
diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 0344aa81d4..bd4d9e4857 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_signals.h b/pimd/pim_signals.h
index 62523c038b..7b25608c10 100644
--- a/pimd/pim_signals.h
+++ b/pimd/pim_signals.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_SIGNALS_H
diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index 231efd0f22..54816d126b 100644
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_sock.h b/pimd/pim_sock.h
index cd29543fa0..f905c661dd 100644
--- a/pimd/pim_sock.h
+++ b/pimd/pim_sock.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_SOCK_H
diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index fba563a6f8..ece644a861 100644
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_ssmpingd.h b/pimd/pim_ssmpingd.h
index 4bef20b209..54f787e2a3 100644
--- a/pimd/pim_ssmpingd.h
+++ b/pimd/pim_ssmpingd.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_SSMPINGD_H
diff --git a/pimd/pim_static.c b/pimd/pim_static.c
index 5882142b32..565d6fe728 100644
--- a/pimd/pim_static.c
+++ b/pimd/pim_static.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_static.h b/pimd/pim_static.h
index 07d31d59b7..c288aa7ff4 100644
--- a/pimd/pim_static.h
+++ b/pimd/pim_static.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_STATIC_H_
diff --git a/pimd/pim_str.c b/pimd/pim_str.c
index 3a8353cd8c..c817045697 100644
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_str.h b/pimd/pim_str.h
index 925f17f732..d2af0110a4 100644
--- a/pimd/pim_str.h
+++ b/pimd/pim_str.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_STR_H
diff --git a/pimd/pim_time.c b/pimd/pim_time.c
index 4e5832cc65..75f767fef1 100644
--- a/pimd/pim_time.c
+++ b/pimd/pim_time.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_time.h b/pimd/pim_time.h
index 2984d9a8df..8ccc6a9207 100644
--- a/pimd/pim_time.h
+++ b/pimd/pim_time.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_TIME_H
diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c
index 38f6de9fea..546ceb86e1 100644
--- a/pimd/pim_tlv.c
+++ b/pimd/pim_tlv.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_tlv.h b/pimd/pim_tlv.h
index 8556e931ab..16c5aa4b97 100644
--- a/pimd/pim_tlv.h
+++ b/pimd/pim_tlv.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_TLV_H
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 8267885756..059de3b62e 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h
index ea44707c54..f10c8feb3b 100644
--- a/pimd/pim_upstream.h
+++ b/pimd/pim_upstream.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_UPSTREAM_H
diff --git a/pimd/pim_util.c b/pimd/pim_util.c
index 57a8488eca..f5b6a8210a 100644
--- a/pimd/pim_util.c
+++ b/pimd/pim_util.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_util.h b/pimd/pim_util.h
index a8613e2b97..d780bfbc27 100644
--- a/pimd/pim_util.h
+++ b/pimd/pim_util.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_UTIL_H
diff --git a/pimd/pim_version.c b/pimd/pim_version.c
index f3a5ee3359..a43c27d5b5 100644
--- a/pimd/pim_version.c
+++ b/pimd/pim_version.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_version.h b/pimd/pim_version.h
index ef9f370c73..64e07862d6 100644
--- a/pimd/pim_version.h
+++ b/pimd/pim_version.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_VERSION_H
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 037a00c4da..07c65e4e53 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_vty.h b/pimd/pim_vty.h
index 904ee55302..18a632e016 100644
--- a/pimd/pim_vty.h
+++ b/pimd/pim_vty.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_VTY_H
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 1822de2299..f2195960c4 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_zebra.h b/pimd/pim_zebra.h
index 8e8f09551a..257c9b896f 100644
--- a/pimd/pim_zebra.h
+++ b/pimd/pim_zebra.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_ZEBRA_H
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index 86d7edbd01..af561a0b62 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_zlookup.h b/pimd/pim_zlookup.h
index f2be6d4fa0..dbce92647b 100644
--- a/pimd/pim_zlookup.h
+++ b/pimd/pim_zlookup.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_ZLOOKUP_H
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 91d8d56afc..15e52afc1d 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pimd.conf.sample b/pimd/pimd.conf.sample
index 67530856b6..de1da6b838 100644
--- a/pimd/pimd.conf.sample
+++ b/pimd/pimd.conf.sample
@@ -1,6 +1,5 @@
 !
 ! pimd sample configuration file
-! $QuaggaId: $Format:%an, %ai, %h$ $
 !
 hostname quagga-pimd-router
 password zebra
diff --git a/pimd/pimd.h b/pimd/pimd.h
index 8855a2ab3f..2230a6ce91 100644
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIMD_H
diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c
index 5c4574024b..29143f362e 100644
--- a/pimd/test_igmpv3_join.c
+++ b/pimd/test_igmpv3_join.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/tests/bgp_mpath_test.c b/tests/bgp_mpath_test.c
index 723f2977d5..f9eb1534f3 100644
--- a/tests/bgp_mpath_test.c
+++ b/tests/bgp_mpath_test.c
@@ -1,5 +1,4 @@
-/* $QuaggaId: Format:%an, %ai, %h$ $
- *
+/*
  * BGP Multipath Unit Test
  * Copyright (C) 2010 Google Inc.
  *
diff --git a/tests/table_test.c b/tests/table_test.c
index ee81927073..4042e1aaa2 100644
--- a/tests/table_test.c
+++ b/tests/table_test.c
@@ -1,5 +1,4 @@
-/* $QuaggaId: Format:%an, %ai, %h$ $
- *
+/*
  * Routing table test
  * Copyright (C) 2012 OSR.
  *
diff --git a/zebra/client_main.c b/zebra/client_main.c
index 24bfa56d02..8290eafc4d 100644
--- a/zebra/client_main.c
+++ b/zebra/client_main.c
@@ -1,6 +1,4 @@
 /*
- * $Quagga: $Format:%an, %ai, %h$ $
- *
  * GNU Zebra client test main routine.
  * Copyright (C) 1997 Kunihiro Ishiguro
  *