diff --git a/ChangeLog b/ChangeLog
index 1b8650dd..84e23638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-19  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #29263: Can't build avrdude on windows using latest cygwin 1.7.1
+	* doc/avrdude.texi: Remove the recommendation for building
+	Win32 binaries under Cygwin; mention MinGW as an alternative
+	environment.
+
 2010-03-08  Michal Ludvig <mludvig@logix.net.nz>
 
 	* ser_posix.c(ser_set_dtr_rts): Fixed DTR on/off to make
diff --git a/doc/avrdude.texi b/doc/avrdude.texi
index d4c96d76..1ec4489c 100644
--- a/doc/avrdude.texi
+++ b/doc/avrdude.texi
@@ -1967,7 +1967,8 @@ A Windows executable of avrdude is included in WinAVR which can be found at
 @url{http://sourceforge.net/projects/winavr}. WinAVR is a suite of executable, 
 open source software development tools for the AVR for the Windows platform.
 
-To build avrdude from the source You must have Cygwin (@url{http://www.cygwin.com/}).
+There are two options to build avrdude from source under Windows.
+The first one is to use Cygwin (@url{http://www.cygwin.com/}).
 
 To build and install from the source tarball for Windows (using Cygwin):
 
@@ -1982,6 +1983,17 @@ $ make
 $ make install
 @end example
 
+Note that recent versions of Cygwin (starting with 1.7) removed the
+MinGW support from the compiler that is needed in order to build a
+native Win32 API binary that does not require to install the Cygwin
+library @code{cygwin1.dll} at run-time.  Either try using an older
+compiler version that still supports MinGW builds, or use MinGW
+(@url{http://www.mingw.org/}) directly.
+
+@c
+@c XXX Please add more detailed instructions here.
+@c
+
 
 @c
 @c Node