diff --git a/ChangeLog b/ChangeLog
index 21f1ec57..fee08fd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-19 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* fixpath.sh.in: Restructure slightly so we can easily edit the
+	fixpath.sh to force cygwin style paths.
+	* Documentation/README.cygwin: Edd note about editing fixpath.sh
+
 Mon Mar 18 16:57:20 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* common.make: If REMOVE_EMPTY_DIRS is yes, remove efficiently all
diff --git a/Documentation/README.cygwin b/Documentation/README.cygwin
index 29edf65c..f5e60dac 100644
--- a/Documentation/README.cygwin
+++ b/Documentation/README.cygwin
@@ -32,8 +32,10 @@ been depreciated. You'll need to use /cygwin/path or C: style paths now.
 MinGW on Cygwin
 ---------------
 
-This is the only configuration I've tested so far. This method uses
-the Cygwin tools to help out with the configuration and compilation of
+Not recommended ... this is a corss compilation solution ... using native
+mingw/msys is simpler and less error prone.
+
+Uses the Cygwin tools to help out with the configuration and compilation of
 the libraries. It's always good to get the very latest version of
 Cygwin and MinGW. These instructions were performed
 with Cygwin DLL 1.3.9-1 and MingW gcc 2.95.3-6. If you have more
@@ -72,6 +74,10 @@ First, go to the 'gnustep-make' package and configure:
   cd gnustep-make
   ./configure --target=i386-mingw32
 
+2a.  The configure script may not have recognised that you are running in
+a cygwin environment ... so you may need to edit 'fixpath.sh' to set the
+CYGWIN variable to 'yes' before you build and install the make package.
+
 3. Now build the gnustep-make package. Occationally, the make that comes
 with MinGW doesn't like the way GNUstep makefiles are setup (or perhaps
 it's that MingW make doesn't work with bash), so you can try
diff --git a/fixpath.sh.in b/fixpath.sh.in
index c6f534ec..c920f884 100755
--- a/fixpath.sh.in
+++ b/fixpath.sh.in
@@ -22,6 +22,12 @@
 #   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
+#
+# Define CYGWIN to "yes" to force cygwin style path handling, or
+# to anything else for MINGW32/MSYS style path handling.
+#
+CYGWIN="@CYGWIN@"
+
 if [ ! $# -eq 2 ]; then
   quit="yes"
 fi
@@ -44,7 +50,7 @@ if [ "$operation" = "-u" ]; then
   #
   # convert to Unix style file name
   #
-  if [ "@CYGWIN@" = "yes" ]; then
+  if [ "$CYGWIN" = "yes" ]; then
     #
     # drive:directory --> /cygdrive/drive/directory
     #
@@ -64,7 +70,7 @@ else
   #
   # convert to Windows style file name
   #
-  if [ "@CYGWIN@" = "yes" ]; then
+  if [ "$CYGWIN" = "yes" ]; then
     #
     # /cygdrive/drive/directory --> drive:directory
     #