diff --git a/ChangeLog b/ChangeLog
index 487405eb..0ffbc0e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 12 06:29:39 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* libxml.h: fixed an error in last commit
+	* doc/FAQ.html: added an entry for compilation from CVS
+
 Mon Jun 11 10:07:29 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* xmlversion.h.in libxml.h: Cygwin patches
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 682bc4c9..6d76fb0d 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -148,6 +148,11 @@ href="http://xmlsoft.org/messages/">http://xmlsoft.org/messages/</a></p>
     some platforms the diff return breaks the compilation process, if the diff
     is small this is probably not a serious problem</p>
   </li>
+  <li><em>I use the CVS version and there is no configure script</em>
+    <p>The configure (and other Makefiles) are generated. Use the autogen.sh
+    script to regenerate the configure and Makefiles, like:</p>
+    <p><code>./autogen.sh --prefix=/usr --disable-shared</code></p>
+  </li>
 </ol>
 
 <h2><a name="Developer">Developer</a> corner</h2>
diff --git a/libxml.h b/libxml.h
index 647768c0..ba392f37 100644
--- a/libxml.h
+++ b/libxml.h
@@ -9,7 +9,7 @@
 #ifndef __XML_LIBXML_H__
 #define __XML_LIBXML_H__
 
-#if !defined(WIN32) || defined(__CYGWIN__)
+#if defined(WIN32) && !defined(__CYGWIN__)
 #include "win32config.h"
 #else
 #include "config.h"