diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index bc1f5f4c..ff0edc69 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-14  Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* avrdude.conf.in: add a jtag2slow programmer alias, and make
+	"jtag2" default to 115200 Bd.
+	* doc/avrdude.texi: document the above changes.
+
 2005-08-30  Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* usb_libusb.c: Consistently use unsigned char for buffers.
diff --git a/avrdude/avrdude.conf.in b/avrdude/avrdude.conf.in
index 88a71e22..b640cc8b 100644
--- a/avrdude/avrdude.conf.in
+++ b/avrdude/avrdude.conf.in
@@ -288,7 +288,7 @@ programmer
 
 # easier to type
 programmer
-  id    = "jtag2";
+  id    = "jtag2slow";
   desc  = "Atmel JTAG ICE mkII";
   baudrate = 19200;    # default is 19200
   type  = jtagmkii;
@@ -302,6 +302,14 @@ programmer
   type  = jtagmkii;
 ;
 
+# make the fast one the default, people will love that
+programmer
+  id    = "jtag2";
+  desc  = "Atmel JTAG ICE mkII";
+  baudrate = 115200;
+  type  = jtagmkii;
+;
+
 programmer
   id    = "pavr";
   desc  = "Jason Kyle's pAVR Serial Programmer";
diff --git a/avrdude/doc/avrdude.texi b/avrdude/doc/avrdude.texi
index 221e9f5b..29958075 100644
--- a/avrdude/doc/avrdude.texi
+++ b/avrdude/doc/avrdude.texi
@@ -421,12 +421,15 @@ Atmel Butterfly Development Board
 Dontronics DT006
 
 @item jtagmkII
-@itemx jtag2
+@itemx jtag2slow
 Atmel JTAG ICE mkII (default speed 19200 Bd)
 
 @itemx jtag2fast
 Atmel JTAG ICE mkII, running at 115200 Bd
 
+@itemx jtag2
+Same as before.
+
 @itemx pavr
 Jason Kyle's pAVR Serial Programmer