diff --git a/ChangeLog b/ChangeLog
index 2795935d..68292b62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-31 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* avrdude.conf.in: Introduce a "stk500v1" entry, so we
+	can switch the default "stk500" to "stk500v2" some day.
+
 2006-08-31 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	The major part of this change has been contributed by
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 89a6cdbe..cef4fd96 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -314,15 +314,24 @@ programmer
   type  =  stk500v2;
 ;
 
+# This is supposed to be the "default" STK500 entry.
+# Refers to V1 by now, might be changed to V2 in a
+# future release.
 programmer
   id    = "stk500";
   desc  = "Atmel STK500";
   type  = stk500;
 ;
 
+programmer
+  id    = "stk500v1";
+  desc  = "Atmel STK500 Version 1.x firmware";
+  type  = stk500;
+;
+
 programmer
   id    = "stk500v2";
-  desc  = "Atmel STK500 V2";
+  desc  = "Atmel STK500 Version 2.x firmware";
   type  = stk500v2;
 ;