diff --git a/INSTALL.quagga.txt b/INSTALL.quagga.txt
index f627c92..ec4e799 100644
--- a/INSTALL.quagga.txt
+++ b/INSTALL.quagga.txt
@@ -1,5 +1,3 @@
-# $Id$
-
 --------------------------------------------------------------------------
 Building and Installing Quagga from releases or snapshots:
 
diff --git a/configure.ac b/configure.ac
index 4209c0b..a5b9dc4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,6 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id$
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.99.17.1, [https://bugzilla.quagga.net])
diff --git a/isisd/dict.c b/isisd/dict.c
index 6c3e1e7..a78b82a 100644
--- a/isisd/dict.c
+++ b/isisd/dict.c
@@ -13,9 +13,6 @@
  * This source code may be translated into executable form and incorporated
  * into proprietary software; there is no requirement for such software to
  * contain a copyright notice related to this source.
- *
- * $Id$
- * $Name$
  */
 
 #include <stdlib.h>
diff --git a/lib/command.c b/lib/command.c
index 478125f..45eb9e3 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1,6 +1,4 @@
 /*
-   $Id$
- 
    Command interpreter routine for virtual terminal [aka TeletYpe]
    Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
 
diff --git a/lib/log.c b/lib/log.c
index df6e13d..8a7e5f3 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Logging of zebra
  * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro
  *
diff --git a/lib/log.h b/lib/log.h
index 2dd1d31..1f9a689 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Zebra logging funcions.
  * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro
  *
diff --git a/lib/memtypes.c b/lib/memtypes.c
index 05d9322..d0ce8c5 100644
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -5,8 +5,6 @@
  *
  * The script is sensitive to the format (though not whitespace), see
  * the top of memtypes.awk for more details.
- *
- * $Id$
  */
 
 #include "zebra.h"
diff --git a/lib/route_types.awk b/lib/route_types.awk
index eb3d382..6cfd537 100644
--- a/lib/route_types.awk
+++ b/lib/route_types.awk
@@ -1,5 +1,3 @@
-# $Id$
-#
 # Scan a file of route-type definitions (see eg route_types.txt) and
 # generate a corresponding header file with:
 #
diff --git a/solaris/Makefile.am b/solaris/Makefile.am
index ecaf9b9..dcee240 100644
--- a/solaris/Makefile.am
+++ b/solaris/Makefile.am
@@ -1,5 +1,4 @@
 # Solaris packages automake file
-# $Id$
 
 # XXX This file uses GNU make extensions.
 
diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in
index 8457e99..0042624 100755
--- a/solaris/quagga.init.in
+++ b/solaris/quagga.init.in
@@ -20,8 +20,6 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 #
-# $Id$
-#
 # Starts/stops the given daemon
 
 SMFINCLUDE=/lib/svc/share/smf_include.sh
diff --git a/tests/heavy-wq.c b/tests/heavy-wq.c
index a2c609d..e5f688c 100644
--- a/tests/heavy-wq.c
+++ b/tests/heavy-wq.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This file is part of Quagga.
  *
  * Quagga is free software; you can redistribute it and/or modify it
diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index fb628ac..b57fd3a 100644
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1,6 +1,4 @@
 /*
-    $Id$
-
     Monitor status of quagga daemons and restart if necessary.
 
     Copyright (C) 2004  Andrew J. Schorr