diff --git a/ChangeLog b/ChangeLog
index 75e63d8d..b466efa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-30  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #34027: avrdude AT90S1200 Problem (part 3 - documentation)
+	* avrdude.1: Document the programmer type restrictions for AT90S1200
+	devices.
+	* doc/avrdude.texi: (Ditto.)
+
 2011-08-30  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	bug #34027: avrdude AT90S1200 Problem (part 2 - stk500v2 and relatives)
diff --git a/avrdude.1 b/avrdude.1
index f63f527e..354da762 100644
--- a/avrdude.1
+++ b/avrdude.1
@@ -19,7 +19,7 @@
 .\"
 .\" $Id$
 .\"
-.Dd DATE August 17, 2011
+.Dd DATE August 30, 2011
 .Os
 .Dt AVRDUDE 1
 .Sh NAME
@@ -211,7 +211,7 @@ the format.  Currently, the following MCU types are understood:
 .TS
 ll.
 \fBOption tag\fP	\fBOfficial part name\fP
-1200	AT90S1200
+1200	AT90S1200 (****)
 2313	AT90S2313
 2333	AT90S2333
 2343	AT90S2343 (*)
@@ -322,6 +322,11 @@ and bit-bang programmers.
 .It "(***)"
 The ATtiny11 uses the same algorithm, but can only be
 programmed in high-voltage serial mode.
+.It "(****)"
+The ISP programming protocol of the AT90S1200 differs in subtle ways
+from that of other AVRs.  Thus, not all programmers support this
+device.  Known to work are all direct bitbang programmers, and all
+programmers talking the STK500v2 protocol.
 .El
 .It Fl b Ar baudrate
 Override the RS-232 connection baud rate specified in the respective
diff --git a/doc/avrdude.texi b/doc/avrdude.texi
index 4ea19bf5..a24ca226 100644
--- a/doc/avrdude.texi
+++ b/doc/avrdude.texi
@@ -307,7 +307,7 @@ datasheet so that you can enter the programming specifications.
 Currently, the following MCU types are understood:
 
 @multitable @columnfractions .15 .3
-@item @code{1200}  @tab AT90S1200
+@item @code{1200}  @tab AT90S1200 (****)
 @item @code{2313}  @tab AT90S2313
 @item @code{2333}  @tab AT90S2333
 @item @code{2343}  @tab AT90S2343 (*)
@@ -419,6 +419,12 @@ and bit-bang programmers.
 The ATtiny11 uses the same algorithm, but can only be
 programmed in high-voltage serial mode.
 
+(****)
+The ISP programming protocol of the AT90S1200 differs in subtle ways
+from that of other AVRs.  Thus, not all programmers support this
+device.  Known to work are all direct bitbang programmers, and all
+programmers talking the STK500v2 protocol.
+
 @item -b @var{baudrate}
 Override the RS-232 connection baud rate specified in the respective
 programmer's entry of the configuration file.