diff --git a/ChangeLog b/ChangeLog
index a25111e7..5de11b29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-26  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #38172: avrftdi: Incorrect information in avrdude.conf
+	* avrdude.conf.in (avrftdi): fix comments about ACBUS vs. ADBUS;
+	add a comment that the MPSSE signals are fixed by the FTDI
+	hardware and cannot be changed
+
 2013-01-09  Rene Liebscher <R.Liebscher@gmx.de>
 
 	patch #7165 Add support for bitbanging GPIO lines using the Linux sysf GPIO interface
diff --git a/avrdude.conf.in b/avrdude.conf.in
index b4c4b36a..0eb79a9f 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -366,6 +366,11 @@ programmer
 # The drivers will look for a specific device and use the first one found.
 # If you have mulitple devices, then look for unique information (like SN)
 # And fill that in here.
+#
+# Note that the pin numbers for the main ISP signals (reset, sck,
+# mosi, miso) are fixed and cannot be changed, since they must match
+# the way the Multi-Protocol Synchronous Serial Engine (MPSSE) of
+# these FTDI ICs has been designed.
 
 programmer
   id         = "avrftdi";
@@ -378,17 +383,17 @@ programmer
   usbproduct = "";
   usbdev     = "A";
   usbsn      = "";
-#ISP-signals - lower ACBUS-Nibble (default)
+#ISP-signals - lower ADBUS-Nibble (default)
   reset  = 4;
   sck    = 1;
   mosi   = 2;
   miso   = 3;
-#LED SIGNALs - higher ACBUS-Nibble
+#LED SIGNALs - higher ADBUS-Nibble
 #  errled = 5;
 #  rdyled = 6;
 #  pgmled = 7;
 #  vfyled = 8;
-#Buffer Signal - ADBUS - Nibble
+#Buffer Signal - ACBUS - Nibble
 #  buff   = 9;
 ;
 # This is an implementation of the above with a buffer IC (74AC244) and