--- a/nt/README	Mon Aug 13 10:43:56 2007 +0200
+++ b/nt/README	Mon Aug 13 10:44:22 2007 +0200
@@ -30,38 +30,61 @@
 
 If you want to build for native GUI:
 
-1.  If you want XPM and toolbar support grab the latest version of the xpm
-    sources (xpm-3.4k.tar.gz at time of writing) and unpack them somewhere.
+1.  If you want XPM image and toolbar support grab the latest version of the
+    xpm sources (xpm-3.4k.tar.gz at time of writing) and unpack them somewhere.
     Copy nt\xpm.mak from the xemacs sources to the lib subdirectory of the
-    xpm sources, cd to that directory and build xpm with `nmake -f xpm.mak`.
+    xpm sources, cd to that directory and build xpm with 'nmake -f xpm.mak'.
+
+2.  You probably also want PNG image support. Grab the latest versions of zlib
+    and libpng (zlib-1.1.3 and libpng-1.0.2 at time of writing), unpack them
+    somewhere and read the respective READMEs for details on how to build them.
+    The following build procedure works for zlib-1.1.3 and libpng-1.0.2:
 
-2.  cd to the nt subdirectory of the xemacs distribution and build xemacs:
+    cd to the zlib directory, type 'copy msdos\makefile.w32 Makefile' and
+    then type 'nmake'.
+
+    cd to the libpng directory, rename or move the zlib directory to ..\zlib
+    and type 'nmake -f scripts\makefile.w32'.
+
+3.  If you want JPEG and/or TIFF support grab the latest versions of jpegsrc
+    and/or libtiff and read the respective READMEs for details on how to build
+    them.
+
+4.  cd to the nt subdirectory of the xemacs distribution and build xemacs:
     `nmake install -f xemacs.mak`, but read on before hitting Enter.
 
-3.  If you're building with XPM support, add this to the nmake command line:
-	HAVE_XPM=1 XPM_DIR="x:\location\of\your\xpm\source\tree"
+5.  If you're building with XPM support, add this to the nmake command line:
+	HAVE_XPM=1 XPM_DIR="x:\location\of\your\xpm\sources"
+    and similarly for JPEG and TIFF support.
 
-4.  By default, XEmacs will look for packages in
+    If you're building with PNG support, add this to the nmake command line:
+	HAVE_PNG=1 PNG_DIR="x:\location\of\your\png\sources"
+	ZLIB_DIR="x:\location\of\your\zlib\sources"
+
+    If you want to build with GIF support, add this to the nmake command line:
+	HAVE_GIF=1
+
+6.  By default, XEmacs will look for packages in
     "c:\Program Files\XEmacs\packages". If you want it to look elsewhere,
     add this to the nmake command line:
 	PACKAGEPATH="x:\\location\\of\\your\\packages"
     Note the doubled-up backslashes in that path. If you want to change the
     package path after you've already built XEmacs, delete the file
-    .\obj\emacs.obj and rebuild with the new value of PACKAGEPATH.
+    .\obj\emacs.obj before rebuilding with the new value of PACKAGEPATH.
 
-5.  By default, XEmacs will be installed in directories under the directory
+7.  By default, XEmacs will be installed in directories under the directory
     "c:\Program Files\XEmacs\XEmacs-21.0". If you want to install it
     elsewhere, add this to the nmake command line:
 	INSTALL_DIR="x:\your\installation\directory"
 
-6.  Now you can press Enter. nmake will build temacs, the DOC file, update the
+8.  Now you can press Enter. nmake will build temacs, the DOC file, update the
     elc's, dump xemacs and install the relevant files in the directories under
-    the installation directory. Unless you set INSTALL_DIR in step 5 above, the
-    file that you should run to start XEmacs will be installed as
+    the installation directory. Unless you set INSTALL_DIR above, the file that
+    you should run to start XEmacs will be installed as
     "c:\Program Files\XEmacs\XEmacs-21.0\i386-pc-win32\runemacs.exe". You may
     want to create a shortcut to that file from your Desktop or Start Menu.
 
-7.  The build process always creates debugging and "Source Browser" information
+9.  The build process always creates debugging and "Source Browser" information
     in the source tree for use with MS DevStudio. If you actually want to debug
     XEmacs you should run XEmacs from the source directory instead of from the
     installation directory. You should probably also build a debug version of