diff --git a/ChangeLog b/ChangeLog
index 0de226f3..a0918a27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-29 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	Submitted by Wolfgang Moser:
+	patch #6121: ISP support for the C2N232I device (serial port
+	bitbanging)
+	* avrdude.conf.in: Add entry for c2n232i.
+
 2007-10-29 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	Submitted by <karl.yerkes@gmail.com>:
diff --git a/NEWS b/NEWS
index 7e74388b..35a10ec0 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Current:
 
   * Add support for the USBtinyISP programmer (patch #6233)
 
+  * Add support for the C2N232I serial bitbang programmer (patch #6121)
+
   * Bugfixes.
 
 Version 5.4:
diff --git a/avrdude.conf.in b/avrdude.conf.in
index c63294ac..f76e480b 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -785,6 +785,19 @@ programmer
   miso  = 8;
 ;
 
+# C2N232i (jumper configuration "auto")
+# reset=dtr sck=!rts mosi=!txd miso=!cts
+
+programmer
+  id    = "c2n232i";
+  desc  = "serial port banging, reset=dtr sck=!rts mosi=!txd miso=!cts";
+  type  = serbb;
+  reset = 4;
+  sck   = ~7;
+  mosi  = ~3;
+  miso  = ~8;
+;
+
 #
 # PART DEFINITIONS
 #
diff --git a/doc/avrdude.texi b/doc/avrdude.texi
index 4a8f1e51..bf4ede95 100644
--- a/doc/avrdude.texi
+++ b/doc/avrdude.texi
@@ -389,6 +389,9 @@ Brian Dean's Programmer,@*
 @url{http://www.bsdhome.com/avrdude/}
 @item @code{butterfly}   @tab
 Atmel Butterfly Development Board
+@item @code{c2n232i}     @tab
+C2N232I, reset=dtr sck=!rts mosi=!txd miso=!cts,@*
+@url{http://www.ktverkko.fi/~msmakela/8bit/c2n232/hardware/index.en.html}
 @item @code{dapa}        @tab
 Direct AVR Parallel Access cable
 @item @code{dasa}        @tab