diff --git a/ChangeLog b/ChangeLog
index ff18496..dfe618a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-30  Bruno Haible  <bruno@clisp.org>
+
+	* README.woe32: Update for Cygwin 1.7.x.
+
 2009-12-26  Bruno Haible  <bruno@clisp.org>
 
 	* windows/libiconv.rc: Update.
diff --git a/README.woe32 b/README.woe32
index e3ddae6..ae8320b 100644
--- a/README.woe32
+++ b/README.woe32
@@ -1,4 +1,4 @@
-Installation on Woe32 (WinNT/2000/XP/Vista, Win95/98/ME):
+Installation on Woe32 (WinNT/2000/XP/Vista/7, Win95/98/ME):
 
 Building requires the mingw or cygwin development environment (includes gcc).
 MS Visual C/C++ with "nmake" is no longer supported.
@@ -26,8 +26,8 @@
    PATH=/usr/local/mingw/bin:$PATH
    export PATH
    ./configure --host=i586-pc-mingw32 --prefix=/usr/local/mingw \
-     CC="gcc -mno-cygwin" \
-     CXX="g++ -mno-cygwin" \
+     CC="gcc-3 -mno-cygwin" \
+     CXX="g++-3 -mno-cygwin" \
      CPPFLAGS="-Wall -I/usr/local/mingw/include" \
      LDFLAGS="-L/usr/local/mingw/lib"
 
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
index 05d1380..bb4273f 100644
--- a/libcharset/ChangeLog
+++ b/libcharset/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-30  Bruno Haible  <bruno@clisp.org>
+
+	* README.woe32: Mention Cygwin.
+
 2009-12-11  Bruno Haible  <bruno@clisp.org>
 
 	* include/libcharset.h.in: Untabify.
diff --git a/libcharset/README.woe32 b/libcharset/README.woe32
index 640307c..4ac0c41 100644
--- a/libcharset/README.woe32
+++ b/libcharset/README.woe32
@@ -1,4 +1,4 @@
-Installation on Woe32 (WinNT/2000/XP/Vista, Win95/98/ME):
+Installation on Woe32 (WinNT/2000/XP/Vista/7, Win95/98/ME):
 
-Building requires the mingw development environment (includes gcc).
+Building requires the mingw or cygwin development environment (includes gcc).
 MS Visual C/C++ with "nmake" is no longer supported.