diff --git a/ChangeLog b/ChangeLog
index 05fe61f7..5a467aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-14  Jay Berkenbilt  <ejb@ql.org>
+
+	* Rename README.windows to README-windows.txt and convert its line
+	endings to Windows-style line endings.  Also mention Jian Ma's VC6
+	port in the manual and README-windows.txt.
+
 2010-08-09  Jay Berkenbilt  <ejb@ql.org>
 
 	* Add QPDFObjectHandle::getRawStreamData to return raw
diff --git a/README-windows.txt b/README-windows.txt
index 2b665c31..dda0caf2 100644
--- a/README-windows.txt
+++ b/README-windows.txt
@@ -12,6 +12,11 @@ want to run them, you need ghostscript and tiff utils as well.  Then
 omit --disable-test-compare-images from the configure statements given
 below.  The image comparison tests have not been tried under MSYS.
 
+Jian Ma <stronghorse@tom.com> has generously provided a port of QPDF
+that works with Microsoft VC6.  Several changes are required, but they
+are well documented in his port.  You can find the VC6 port in the
+contrib area of the qpdf download area.
+
 
 External Libraries
 ==================
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 80b59917..c10e6195 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -182,7 +182,10 @@ make
     Building on Windows is a little bit more complicated.  For
     details, please see <filename>README-windows.txt</filename> in the
     source distribution.  You can also download a binary distribution
-    for Windows.
+    for Windows.  There is a port of qpdf in the
+    <filename>contrib</filename> area generously contributed by Jian
+    Ma.  This is also discussed in more detail in
+    <filename>README-windows.txt</filename>.
    </para>
    <para>
     There are some other things you can do with the build.  Although