diff --git a/NEWS b/NEWS
index 50f039ee..98aa9450 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,3 @@
-$Id$
-
 Approximate change log for AVRDUDE by version.
 
 (For detailed changes, see the version control system logs.)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e7a76ad..46ee98e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,10 +26,6 @@
 #
 # make V=1
 
-#
-# $Id$
-#
-
 EXTRA_DIST   = \
 	avrdude.1 \
 	avrdude.spec \
diff --git a/src/arduino.c b/src/arduino.c
index 70072da7..16d56f46 100644
--- a/src/arduino.c
+++ b/src/arduino.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for Arduino programmer
  *
diff --git a/src/arduino.h b/src/arduino.h
index ce1ff9b8..eed3343d 100644
--- a/src/arduino.h
+++ b/src/arduino.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef arduino_h__
 #define arduino_h__
 
diff --git a/src/avr.c b/src/avr.c
index fe48def3..453d1b4b 100644
--- a/src/avr.c
+++ b/src/avr.c
@@ -18,8 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <stdio.h>
diff --git a/src/avr910.c b/src/avr910.c
index 2770a04a..95329c04 100644
--- a/src/avr910.c
+++ b/src/avr910.c
@@ -18,8 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for Atmel Low Cost Serial programmers which adher to the
  * protocol described in application note avr910.
diff --git a/src/avr910.h b/src/avr910.h
index f30fa6a3..4a32d218 100644
--- a/src/avr910.h
+++ b/src/avr910.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef avr910_h
 #define avr910_h
 
diff --git a/src/avrcache.c b/src/avrcache.c
index dbf49201..c4b7a2db 100644
--- a/src/avrcache.c
+++ b/src/avrcache.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <stdio.h>
diff --git a/src/avrdude.1 b/src/avrdude.1
index 2f43e8af..0b81eef2 100644
--- a/src/avrdude.1
+++ b/src/avrdude.1
@@ -17,8 +17,6 @@
 .\" along with this program. If not, see <http://www.gnu.org/licenses/>.
 .\"
 .\"
-.\" $Id$
-.\"
 .Dd January 15, 2023
 .Os
 .Dt AVRDUDE 1
diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 8495e72d..9ef0a575 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -1,6 +1,4 @@
-# $Id$ -*- text -*-
-#
-# AVRDUDE Configuration File
+# AVRDUDE Configuration File                               -*- text -*-
 #
 
 avrdude_conf_version = "@AVRDUDE_FULL_VERSION@";
diff --git a/src/avrdude.h b/src/avrdude.h
index 336690a1..bc3a2c6b 100644
--- a/src/avrdude.h
+++ b/src/avrdude.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- /* $Id$ */
-
 #ifndef avrdude_h
 #define avrdude_h
 
diff --git a/src/avrdude.spec.in b/src/avrdude.spec.in
index ff9879f6..b1e72e3d 100644
--- a/src/avrdude.spec.in
+++ b/src/avrdude.spec.in
@@ -1,7 +1,5 @@
 ## -*- mode: rpm-spec; -*-
 ##
-## $Id$
-##
 ## @configure_input@
 ##
 
diff --git a/src/avrftdi.c b/src/avrftdi.c
index 1a00bf12..490322ed 100644
--- a/src/avrftdi.c
+++ b/src/avrftdi.c
@@ -17,7 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
 /*
  * Interface to the MPSSE Engine of FTDI Chips using libftdi.
  */
diff --git a/src/avrftdi.h b/src/avrftdi.h
index 30493271..4e1a7a94 100644
--- a/src/avrftdi.h
+++ b/src/avrftdi.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef avrftdi_h
 #define avrftdi_h
 
diff --git a/src/avrpart.c b/src/avrpart.c
index 906a6cbf..78b3f9fa 100644
--- a/src/avrpart.c
+++ b/src/avrpart.c
@@ -19,8 +19,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/src/bitbang.c b/src/bitbang.c
index 6c184832..391a875d 100644
--- a/src/bitbang.c
+++ b/src/bitbang.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
- /* $Id$ */
 
 #include <ac_cfg.h>
 
diff --git a/src/bitbang.h b/src/bitbang.h
index 1e38afb0..93a401e7 100644
--- a/src/bitbang.h
+++ b/src/bitbang.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-/* $Id$ */
 
 #ifndef bitbang_h
 #define bitbang_h
diff --git a/src/buspirate.c b/src/buspirate.c
index 8a741570..ec0b57b6 100644
--- a/src/buspirate.c
+++ b/src/buspirate.c
@@ -33,8 +33,6 @@
  * Tested with BusPirate PTH, firmware version 2.1 programming ATmega328P
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <stdio.h>
diff --git a/src/buspirate.h b/src/buspirate.h
index 12a68a1a..3713a472 100644
--- a/src/buspirate.h
+++ b/src/buspirate.h
@@ -19,8 +19,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef buspirate_h
 #define buspirate_h
 
diff --git a/src/butterfly.c b/src/butterfly.c
index 1337faec..c233eca7 100644
--- a/src/butterfly.c
+++ b/src/butterfly.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for the serial programming mode of the Atmel butterfly
  * evaluation board. This board features a bootloader which uses a protocol
diff --git a/src/butterfly.h b/src/butterfly.h
index c1492504..3ba48dfe 100644
--- a/src/butterfly.h
+++ b/src/butterfly.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef butterfly_h
 #define butterfly_h
 
diff --git a/src/config.c b/src/config.c
index eb7b45a8..2e71cb4a 100644
--- a/src/config.c
+++ b/src/config.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <errno.h>
diff --git a/src/config.h b/src/config.h
index 630f9c7a..e91ca5bc 100644
--- a/src/config.h
+++ b/src/config.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /* These are the internal definitions needed for config parsing */
 
 #ifndef config_h
diff --git a/src/config_gram.y b/src/config_gram.y
index 11f35b4d..eae57dfd 100644
--- a/src/config_gram.y
+++ b/src/config_gram.y
@@ -18,7 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
 %{
 
 #include "ac_cfg.h"
diff --git a/src/configure.ac b/src/configure.ac
index 0b9a2e85..b1e3102c 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -16,10 +16,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-#
-# $Id$
-#
-
 # Process this file with autoreconf to produce a configure script.
 
 dnl A few tool releases with release dates for orientation which tool
diff --git a/src/developer_opts.c b/src/developer_opts.c
index c47b797a..7ddb1db3 100644
--- a/src/developer_opts.c
+++ b/src/developer_opts.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * Code to program an Atmel AVR device through one of the supported
  * programmers.
diff --git a/src/dfu.c b/src/dfu.c
index 5b5e3b72..e206530d 100644
--- a/src/dfu.c
+++ b/src/dfu.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <stdio.h>
diff --git a/src/dfu.h b/src/dfu.h
index d3870b7d..03d2fc46 100644
--- a/src/dfu.h
+++ b/src/dfu.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef dfu_h
 #define dfu_h
 
diff --git a/src/doc/Makefile.am b/src/doc/Makefile.am
index 7be681c8..66b55dc7 100644
--- a/src/doc/Makefile.am
+++ b/src/doc/Makefile.am
@@ -16,10 +16,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-#
-# $Id$
-#
-
 GENERATED_TEXINFOS = \
 	$(builddir)/programmers.texi \
 	$(builddir)/parts.texi \
diff --git a/src/doc/avrdude.texi b/src/doc/avrdude.texi
index 3613631e..e17850e6 100644
--- a/src/doc/avrdude.texi
+++ b/src/doc/avrdude.texi
@@ -1,8 +1,6 @@
 %% -*-texinfo-*-
 \input texinfo
 
-@c $Id$
-
 @setfilename avrdude.info
 @settitle AVRDUDE
 @finalout
diff --git a/src/dryrun.c b/src/dryrun.c
index 8e125bfd..e923fe93 100644
--- a/src/dryrun.c
+++ b/src/dryrun.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * The dryrun programmer emulates a physical programmer by allocating a copy of the part and
  * pretending all operations work well.
diff --git a/src/dryrun.h b/src/dryrun.h
index 7685053a..c6eefb9b 100644
--- a/src/dryrun.h
+++ b/src/dryrun.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef dryrun_h__
 #define dryrun_h__
 
diff --git a/src/dryrun_private.h b/src/dryrun_private.h
index 6e208846..dd5eb736 100644
--- a/src/dryrun_private.h
+++ b/src/dryrun_private.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef dryrun_private_h__
 #define dryrun_private_h__
 
diff --git a/src/fileio.c b/src/fileio.c
index 058c8cdc..45a826fd 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <limits.h>
diff --git a/src/flip1.c b/src/flip1.c
index f486ed07..4efc1121 100644
--- a/src/flip1.c
+++ b/src/flip1.c
@@ -19,8 +19,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <stdint.h>
diff --git a/src/flip1.h b/src/flip1.h
index 276229e3..18af3fab 100644
--- a/src/flip1.h
+++ b/src/flip1.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef flip1_h
 #define flip1_h
 
diff --git a/src/flip2.c b/src/flip2.c
index 50bb486f..793af44a 100644
--- a/src/flip2.c
+++ b/src/flip2.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <stdint.h>
diff --git a/src/flip2.h b/src/flip2.h
index 002d3b3c..eed0cfc1 100644
--- a/src/flip2.h
+++ b/src/flip2.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef flip2_h
 #define flip2_h
 
diff --git a/src/freebsd_ppi.h b/src/freebsd_ppi.h
index 016bf182..40cf60d5 100644
--- a/src/freebsd_ppi.h
+++ b/src/freebsd_ppi.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef freebsd_ppi_h
 #define freebsd_ppi_h
 
diff --git a/src/ft245r.c b/src/ft245r.c
index 7cb93fe7..d245be91 100644
--- a/src/ft245r.c
+++ b/src/ft245r.c
@@ -19,8 +19,6 @@
  */
 
 
-/* $Id$ */
-
 /* ft245r -- FT245R/FT232R Synchronous BitBangMode Programmer
   default pin assign
                FT232R / FT245R
diff --git a/src/jtag3.c b/src/jtag3.c
index 43ae6d5c..1bcdf461 100644
--- a/src/jtag3.c
+++ b/src/jtag3.c
@@ -18,8 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for Atmel JTAGICE3 programmer
  */
diff --git a/src/jtag3.h b/src/jtag3.h
index b6773dab..c130cb27 100644
--- a/src/jtag3.h
+++ b/src/jtag3.h
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef jtag3_h
 #define jtag3_h
 
diff --git a/src/jtag3_private.h b/src/jtag3_private.h
index a26c5160..451e6a25 100644
--- a/src/jtag3_private.h
+++ b/src/jtag3_private.h
@@ -18,8 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 
 /*
  * JTAGICE3 definitions
diff --git a/src/jtagmkI.c b/src/jtagmkI.c
index 23923bf5..38683721 100644
--- a/src/jtagmkI.c
+++ b/src/jtagmkI.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for Atmel JTAG ICE (mkI) programmer
  */
diff --git a/src/jtagmkI.h b/src/jtagmkI.h
index 0a7ade1b..5d40c6b7 100644
--- a/src/jtagmkI.h
+++ b/src/jtagmkI.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef jtagmkI_h
 #define jtagmkI_h
 
diff --git a/src/jtagmkII.c b/src/jtagmkII.c
index be97b147..9ad1bf42 100644
--- a/src/jtagmkII.c
+++ b/src/jtagmkII.c
@@ -21,8 +21,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for Atmel JTAG ICE mkII programmer
  *
diff --git a/src/jtagmkII.h b/src/jtagmkII.h
index b4005c9d..ec8d4bc9 100644
--- a/src/jtagmkII.h
+++ b/src/jtagmkII.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef jtagmkII_h
 #define jtagmkII_h
 
diff --git a/src/jtagmkII_private.h b/src/jtagmkII_private.h
index d3aec68b..3c581d8f 100644
--- a/src/jtagmkII_private.h
+++ b/src/jtagmkII_private.h
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 
 /*
  * JTAG ICE mkII definitions
diff --git a/src/jtagmkI_private.h b/src/jtagmkI_private.h
index e67e0b3f..e2134823 100644
--- a/src/jtagmkI_private.h
+++ b/src/jtagmkI_private.h
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 
 /*
  * JTAG ICE mkI definitions
diff --git a/src/lexer.l b/src/lexer.l
index f0882904..96d0c776 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 %{
 #include <math.h>
 #include <string.h>
diff --git a/src/libavrdude.h b/src/libavrdude.h
index e0d2d5c0..d61fbdd4 100644
--- a/src/libavrdude.h
+++ b/src/libavrdude.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef libavrdude_h
 #define libavrdude_h
 
diff --git a/src/linux_ppdev.h b/src/linux_ppdev.h
index 9b3469e5..ced79e58 100644
--- a/src/linux_ppdev.h
+++ b/src/linux_ppdev.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef linux_ppdev_h
 #define linux_ppdev_h
 
diff --git a/src/lists.c b/src/lists.c
index f44e0947..5c2f5afc 100644
--- a/src/lists.c
+++ b/src/lists.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- /* $Id$ */
-
 
 
 /*----------------------------------------------------------------------
diff --git a/src/main.c b/src/main.c
index 4555d342..aa69571c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * Code to program an Atmel AVR device through one of the supported
  * programmers.
diff --git a/src/par.c b/src/par.c
index 490068e9..f0968e61 100644
--- a/src/par.c
+++ b/src/par.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <stdio.h>
diff --git a/src/par.h b/src/par.h
index e50ea60f..adcca7d0 100644
--- a/src/par.h
+++ b/src/par.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef par_h
 #define par_h
 
diff --git a/src/pgm.c b/src/pgm.c
index f815406b..3c3de18e 100644
--- a/src/pgm.c
+++ b/src/pgm.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <stdio.h>
diff --git a/src/ppi.c b/src/ppi.c
index ee09a598..61bd55ab 100644
--- a/src/ppi.c
+++ b/src/ppi.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 
 #if !defined(WIN32)
 
diff --git a/src/ppi.h b/src/ppi.h
index 7641dd84..8b64a12a 100644
--- a/src/ppi.h
+++ b/src/ppi.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef ppi_h
 #define ppi_h
 
diff --git a/src/ppiwin.c b/src/ppiwin.c
index 077bb7fb..410e3e81 100644
--- a/src/ppiwin.c
+++ b/src/ppiwin.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
 This is the parallel port interface for Windows built using Cygwin.
 
diff --git a/src/ser_avrdoper.c b/src/ser_avrdoper.c
index 2a0ebf7d..8e023ad4 100644
--- a/src/ser_avrdoper.c
+++ b/src/ser_avrdoper.c
@@ -18,8 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * Serial Interface emulation for USB programmer "AVR-Doper" in HID mode.
  */
diff --git a/src/ser_posix.c b/src/ser_posix.c
index 8962f1cd..cd08e39c 100644
--- a/src/ser_posix.c
+++ b/src/ser_posix.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * Posix serial interface for avrdude.
  */
diff --git a/src/serbb.h b/src/serbb.h
index 11808bff..c2233e0a 100644
--- a/src/serbb.h
+++ b/src/serbb.h
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-/* $Id$ */
 
 #ifndef serbb_h
 #define serbb_h
diff --git a/src/serbb_posix.c b/src/serbb_posix.c
index 81393dd2..bae1f382 100644
--- a/src/serbb_posix.c
+++ b/src/serbb_posix.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-/* $Id$ */
 
 /*
  * Posix serial bitbanging interface for avrdude.
diff --git a/src/serbb_win32.c b/src/serbb_win32.c
index ec0f7908..958ee16c 100644
--- a/src/serbb_win32.c
+++ b/src/serbb_win32.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-/* $Id$ */
 
 /*
  * Win32 serial bitbanging interface for avrdude.
diff --git a/src/serialupdi.c b/src/serialupdi.c
index 6c46007d..54f1921e 100644
--- a/src/serialupdi.c
+++ b/src/serialupdi.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Interface to the SerialUPDI programmer.
  *
diff --git a/src/serialupdi.h b/src/serialupdi.h
index 990c395e..f5b2bdbf 100644
--- a/src/serialupdi.h
+++ b/src/serialupdi.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/solaris_ecpp.h b/src/solaris_ecpp.h
index 7db040d1..af956f7b 100644
--- a/src/solaris_ecpp.h
+++ b/src/solaris_ecpp.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef solaris_ecpp_h
 #define solaris_ecpp_h
 
diff --git a/src/stk500.c b/src/stk500.c
index d3a4b0b6..1cb1d4ef 100644
--- a/src/stk500.c
+++ b/src/stk500.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for Atmel STK500 programmer
  *
diff --git a/src/stk500.h b/src/stk500.h
index 6c9b8188..157fb6be 100644
--- a/src/stk500.h
+++ b/src/stk500.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef stk500_h
 #define stk500_h
 
diff --git a/src/stk500generic.c b/src/stk500generic.c
index 2aa331be..b27e4032 100644
--- a/src/stk500generic.c
+++ b/src/stk500generic.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for Atmel STK500 programmer
  *
diff --git a/src/stk500generic.h b/src/stk500generic.h
index c970ac42..40b6b25d 100644
--- a/src/stk500generic.h
+++ b/src/stk500generic.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef stk500generic_h__
 #define stk500generic_h__
 
diff --git a/src/stk500v2.c b/src/stk500v2.c
index 35054740..91fc4398 100644
--- a/src/stk500v2.c
+++ b/src/stk500v2.c
@@ -19,7 +19,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
 /* Based on Id: stk500.c,v 1.46 2004/12/22 01:52:45 bdean Exp */
 
 /*
diff --git a/src/stk500v2.h b/src/stk500v2.h
index 5edcfac2..9f060f3c 100644
--- a/src/stk500v2.h
+++ b/src/stk500v2.h
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef stk500v2_h
 #define stk500v2_h
 
diff --git a/src/term.c b/src/term.c
index a25d63b1..56b7f745 100644
--- a/src/term.c
+++ b/src/term.c
@@ -18,8 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <ac_cfg.h>
 
 #include <ctype.h>
diff --git a/src/tpi.h b/src/tpi.h
index afb26b97..88c548d2 100644
--- a/src/tpi.h
+++ b/src/tpi.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef tpi_h
 #define tpi_h
 
diff --git a/src/update.c b/src/update.c
index 3b1bcb89..a452cdc2 100644
--- a/src/update.c
+++ b/src/update.c
@@ -18,8 +18,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/src/updi_constants.h b/src/updi_constants.h
index 93fbc270..348184d9 100644
--- a/src/updi_constants.h
+++ b/src/updi_constants.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_link.c b/src/updi_link.c
index 735d0a4e..aa555c63 100644
--- a/src/updi_link.c
+++ b/src/updi_link.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_link.h b/src/updi_link.h
index fe350674..2e16ba0e 100644
--- a/src/updi_link.h
+++ b/src/updi_link.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm.c b/src/updi_nvm.c
index 441432b3..683a7bea 100644
--- a/src/updi_nvm.c
+++ b/src/updi_nvm.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm.h b/src/updi_nvm.h
index 50df8f18..60c42b92 100644
--- a/src/updi_nvm.h
+++ b/src/updi_nvm.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v0.c b/src/updi_nvm_v0.c
index f3f1be64..47324fb5 100644
--- a/src/updi_nvm_v0.c
+++ b/src/updi_nvm_v0.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v0.h b/src/updi_nvm_v0.h
index fbf4421d..cda8a6f3 100644
--- a/src/updi_nvm_v0.h
+++ b/src/updi_nvm_v0.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v2.c b/src/updi_nvm_v2.c
index ebf5382b..136a06c3 100644
--- a/src/updi_nvm_v2.c
+++ b/src/updi_nvm_v2.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v2.h b/src/updi_nvm_v2.h
index 59ff5eb5..0daa1263 100644
--- a/src/updi_nvm_v2.h
+++ b/src/updi_nvm_v2.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v3.c b/src/updi_nvm_v3.c
index 73c62bc3..b6cebeb3 100644
--- a/src/updi_nvm_v3.c
+++ b/src/updi_nvm_v3.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v3.h b/src/updi_nvm_v3.h
index 92947400..ca0d3e1f 100644
--- a/src/updi_nvm_v3.h
+++ b/src/updi_nvm_v3.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v4.c b/src/updi_nvm_v4.c
index 0773983a..67d0901a 100644
--- a/src/updi_nvm_v4.c
+++ b/src/updi_nvm_v4.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v4.h b/src/updi_nvm_v4.h
index 14a16353..448c3085 100644
--- a/src/updi_nvm_v4.h
+++ b/src/updi_nvm_v4.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v5.c b/src/updi_nvm_v5.c
index a337678c..4dd10cb0 100644
--- a/src/updi_nvm_v5.c
+++ b/src/updi_nvm_v5.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_nvm_v5.h b/src/updi_nvm_v5.h
index c1102236..c8ade93f 100644
--- a/src/updi_nvm_v5.h
+++ b/src/updi_nvm_v5.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_readwrite.c b/src/updi_readwrite.c
index e2ba1766..167e1682 100644
--- a/src/updi_readwrite.c
+++ b/src/updi_readwrite.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_readwrite.h b/src/updi_readwrite.h
index adef2e8a..7d06c3ff 100644
--- a/src/updi_readwrite.h
+++ b/src/updi_readwrite.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_state.c b/src/updi_state.c
index 5e0a1ae5..8522a75a 100644
--- a/src/updi_state.c
+++ b/src/updi_state.c
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/updi_state.h b/src/updi_state.h
index 4579d8fc..552cb469 100644
--- a/src/updi_state.h
+++ b/src/updi_state.h
@@ -17,8 +17,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id$ */
-
 /*
  * Based on pymcuprog
  * See https://github.com/microchip-pic-avr-tools/pymcuprog
diff --git a/src/urclock.c b/src/urclock.c
index 3c6bd7ea..65db9a0c 100644
--- a/src/urclock.c
+++ b/src/urclock.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * The Urclock programmer
  *
diff --git a/src/urclock.h b/src/urclock.h
index 4315e0d8..5ea349cf 100644
--- a/src/urclock.h
+++ b/src/urclock.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef urclock_h__
 #define urclock_h__
 
diff --git a/src/urclock_hash.h b/src/urclock_hash.h
index 80c009bf..01b41cc7 100644
--- a/src/urclock_hash.h
+++ b/src/urclock_hash.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef urclock_hash_h__
 #define urclock_hash_h__
 
diff --git a/src/urclock_private.h b/src/urclock_private.h
index 65f18179..39fa979a 100644
--- a/src/urclock_private.h
+++ b/src/urclock_private.h
@@ -16,7 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
 
 #ifndef urclock_private_h
 #define urclock_private_h
diff --git a/src/usb_hidapi.c b/src/usb_hidapi.c
index 59c6dee4..9b3bed16 100644
--- a/src/usb_hidapi.c
+++ b/src/usb_hidapi.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * USB interface via libhidapi for avrdude.
  */
diff --git a/src/usb_libusb.c b/src/usb_libusb.c
index 2b11c862..7d16521e 100644
--- a/src/usb_libusb.c
+++ b/src/usb_libusb.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * USB interface via libusb for avrdude.
  */
diff --git a/src/usbasp.c b/src/usbasp.c
index 86957420..44d71689 100644
--- a/src/usbasp.c
+++ b/src/usbasp.c
@@ -17,8 +17,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * Interface to the USBasp programmer.
  *
diff --git a/src/usbasp.h b/src/usbasp.h
index 98d782f1..853c6d90 100644
--- a/src/usbasp.h
+++ b/src/usbasp.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef usbasp_h
 #define usbasp_h
 
diff --git a/src/usbdevs.h b/src/usbdevs.h
index 1872bdaf..6fc6b773 100644
--- a/src/usbdevs.h
+++ b/src/usbdevs.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * defines for the USB interface
  */
diff --git a/src/wiring.c b/src/wiring.c
index 60b8f705..ecbd945d 100644
--- a/src/wiring.c
+++ b/src/wiring.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for Wiring bootloaders
  *
diff --git a/src/wiring.h b/src/wiring.h
index dbe42b8b..08d8112a 100644
--- a/src/wiring.h
+++ b/src/wiring.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef wiring_h__
 #define wiring_h__
 
diff --git a/src/xbee.c b/src/xbee.c
index 378cfc9d..43fb0c72 100644
--- a/src/xbee.c
+++ b/src/xbee.c
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 /*
  * avrdude interface for AVR devices Over-The-Air programmable via an
  * XBee Series 2 device.
diff --git a/src/xbee.h b/src/xbee.h
index 00a1682b..a12f62b2 100644
--- a/src/xbee.h
+++ b/src/xbee.h
@@ -16,8 +16,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Id$ */
-
 #ifndef xbee_h__
 #define xbee_h__
 
diff --git a/tools/get-dw-params.xsl b/tools/get-dw-params.xsl
index a3f083e9..69e76ab7 100644
--- a/tools/get-dw-params.xsl
+++ b/tools/get-dw-params.xsl
@@ -15,8 +15,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id$
 -->
 <!--
  * Extract the debugWire parameters
diff --git a/tools/get-hv-params.xsl b/tools/get-hv-params.xsl
index b4a595f1..482204a8 100644
--- a/tools/get-hv-params.xsl
+++ b/tools/get-hv-params.xsl
@@ -15,8 +15,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id$
 -->
 <!--
  * Extract high-voltage (parallel and serial) programming parameters
diff --git a/tools/get-stk600-cards.xsl b/tools/get-stk600-cards.xsl
index 6165b526..6ca5b7ad 100644
--- a/tools/get-stk600-cards.xsl
+++ b/tools/get-stk600-cards.xsl
@@ -15,8 +15,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id$
 -->
 <!--
     * Extract STK600 routing and socket card information out of
diff --git a/tools/get-stk600-devices.xsl b/tools/get-stk600-devices.xsl
index efba1628..1700f6e8 100644
--- a/tools/get-stk600-devices.xsl
+++ b/tools/get-stk600-devices.xsl
@@ -15,8 +15,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * $Id$
 -->
 <!--
     * Extract STK600 device support out of