diff --git a/INSTALL.tftp b/INSTALL.tftp
index 4bd87a5..914094f 100644
--- a/INSTALL.tftp
+++ b/INSTALL.tftp
@@ -1,5 +1,3 @@
-$Id$
-
 Specific installation instructions
 ==================================
 
diff --git a/MCONFIG.in b/MCONFIG.in
index 35e9af5..716bedc 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -1,13 +1,12 @@
 ## -*- makefile -*- ------------------------------------------------------
 ##   
-##   Copyright 2001 H. Peter Anvin - All Rights Reserved
+##   Copyright 2001-2007 H. Peter Anvin - All Rights Reserved
 ##
 ##   This program is free software available under the same license
 ##   as the "OpenBSD" operating system, distributed at
 ##   http://www.openbsd.org/.
 ##
 ## ----------------------------------------------------------------------- 
-## $Id$
 
 ##
 ## MCONFIG.in
diff --git a/README.security b/README.security
index 58eab7f..644babb 100644
--- a/README.security
+++ b/README.security
@@ -1,7 +1,3 @@
-$Id$
-
-	       =======================================
-
 Starting in version 0.27, tftp-hpa has the option of a "use Unix
 permissions" mode.  In this mode, tftpd can access any file accessible
 by the tftpd effective user, specified via the -u option.  This means
diff --git a/aclocal.m4 b/aclocal.m4
index f53cea9..7b29e86 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,6 @@
-dnl $Id$
 dnl  -----------------------------------------------------------------------
 dnl    
-dnl    Copyright 1999-2002 H. Peter Anvin - All Rights Reserved
+dnl    Copyright 1999-2007 H. Peter Anvin - All Rights Reserved
 dnl 
 dnl    This program is free software; you can redistribute it and/or modify
 dnl    it under the terms of the GNU General Public License as published by
diff --git a/configure.in b/configure.in
index 4d85216..71b746f 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,6 @@ dnl autoconf input file to generate MCONFIG
 dnl
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id$])
 AC_INIT(MCONFIG.in)
 AC_PREFIX_DEFAULT(/usr)
 
diff --git a/tftpd/misc.c b/tftpd/misc.c
index d3c49cd..4f88978 100644
--- a/tftpd/misc.c
+++ b/tftpd/misc.c
@@ -1,7 +1,6 @@
-/* $Id$ */
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 2001 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2001-2007 H. Peter Anvin - All Rights Reserved
  *
  *   This program is free software available under the same license
  *   as the "OpenBSD" operating system, distributed at
diff --git a/tftpd/remap.c b/tftpd/remap.c
index dda5632..bb10fd0 100644
--- a/tftpd/remap.c
+++ b/tftpd/remap.c
@@ -1,7 +1,6 @@
-/* $Id$ */
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 2001-2004 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2001-2007 H. Peter Anvin - All Rights Reserved
  *
  *   This program is free software available under the same license
  *   as the "OpenBSD" operating system, distributed at
diff --git a/tftpd/remap.h b/tftpd/remap.h
index 5315074..a00094c 100644
--- a/tftpd/remap.h
+++ b/tftpd/remap.h
@@ -1,7 +1,6 @@
-/* $Id$ */
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 2001 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2001-2007 H. Peter Anvin - All Rights Reserved
  *
  *   This program is free software available under the same license
  *   as the "OpenBSD" operating system, distributed at