diff --git a/arch/alpha/ecoff_machdep.h b/arch/alpha/ecoff_machdep.h
index 0fe4c43e6..9341b8ff7 100644
--- a/arch/alpha/ecoff_machdep.h
+++ b/arch/alpha/ecoff_machdep.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * Taken from NetBSD arch/alpha/ecoff_machdep.h
  */
diff --git a/arch/isa_parser.py b/arch/isa_parser.py
index d5cdd348b..0faa79728 100755
--- a/arch/isa_parser.py
+++ b/arch/isa_parser.py
@@ -1,7 +1,5 @@
 #! /usr/bin/env python
 
-# $Id$
-
 # Copyright (c) 2003 The Regents of The University of Michigan
 # All rights reserved.
 #
diff --git a/base/crc.cc b/base/crc.cc
index 8bff4b868..87963ef14 100644
--- a/base/crc.cc
+++ b/base/crc.cc
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * Copyright (c) 1988, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/base/kgdb.h b/base/kgdb.h
index a358dfa16..104244d0b 100644
--- a/base/kgdb.h
+++ b/base/kgdb.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/base/loader/coff_sym.h b/base/loader/coff_sym.h
index dae9d8590..734d96a98 100644
--- a/base/loader/coff_sym.h
+++ b/base/loader/coff_sym.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * Taken from binutils-2.14.90.0.5 include/coff/sym.h
  */
diff --git a/base/loader/coff_symconst.h b/base/loader/coff_symconst.h
index caed413c2..87bace02d 100644
--- a/base/loader/coff_symconst.h
+++ b/base/loader/coff_symconst.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * Taken from binutils-2.14.90.0.5 include/coff/symconst.h
  */
diff --git a/base/loader/exec_aout.h b/base/loader/exec_aout.h
index 498e313cb..76ebe9bb5 100644
--- a/base/loader/exec_aout.h
+++ b/base/loader/exec_aout.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * Taken from NetBSD sys/exec_aout.h
  */
diff --git a/base/loader/exec_ecoff.h b/base/loader/exec_ecoff.h
index 0289c94ef..4eece4318 100644
--- a/base/loader/exec_ecoff.h
+++ b/base/loader/exec_ecoff.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * Taken from NetBSD sys/exec_ecoff.h
  */
diff --git a/test/Makefile b/test/Makefile
index 15019a1f5..20abe8466 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,3 @@
-# $Id$
-
 CC?= gcc
 CXX?= g++
 PYTHON?=/usr/bin/env python
diff --git a/util/tap/Makefile b/util/tap/Makefile
index 2618a5210..d961ea814 100644
--- a/util/tap/Makefile
+++ b/util/tap/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2003 The Regents of The University of Michigan
+# Copyright (c) 2003, 2005 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,6 @@
 #
 # Authors: Nathan Binkert
 
-# $Id$
-
 CC= gcc
 CXX= g++
 
diff --git a/util/term/Makefile b/util/term/Makefile
index 39e396687..b360a9e32 100644
--- a/util/term/Makefile
+++ b/util/term/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2003 The Regents of The University of Michigan
+# Copyright (c) 2003, 2005 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,6 @@
 #
 # Authors: Nathan Binkert
 
-# $Id$
-
 CC= gcc
 CCFLAGS= -g -O0
 
diff --git a/util/term/term.c b/util/term/term.c
index 199b8e973..8a95480b1 100644
--- a/util/term/term.c
+++ b/util/term/term.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* $OpenBSD: netcat.c,v 1.57 2002/12/30 18:00:18 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>