diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/CoreTasks/exec.html
index 071656a8e..88bd86670 100644
--- a/docs/manual/CoreTasks/exec.html
+++ b/docs/manual/CoreTasks/exec.html
@@ -12,6 +12,13 @@
 <p>Executes a system command. When the <i>os</i> attribute is specified, then
 the command is only executed when Ant is run on one of the specified operating
 systems.</p>
+
+<h4>Cygwin Users</h4>
+<p>In general the &lt;exec&gt; task will not userstand paths such as /bin/sh for 
+the executable parameter. This is because the Java VM in which Ant is running is a 
+Windows executable and is not aware of Cygwin conventions.
+</p>
+ 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
diff --git a/docs/manual/install.html b/docs/manual/install.html
index 19b4ce4e8..e7eb11dca 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -95,21 +95,34 @@ file there. This directory will be known as ANT_HOME.
 <table width="80%">
 <tr>
   <td colspan="2">
-    <b>Windows 95 and Windows 98 Note:</b> 
+    <b>Windows 95, Windows 98 &amp; Windows ME Note:</b> 
   </td>
 </tr>
 <tr>
   <td width="5%">&nbsp;</td>
   <td><i>
 On these systems, the script used to launch Ant will have 
-problems if ANT_HOME is a long filename. This is due to 
+problems if ANT_HOME is a long filename (i.e. a filename which is not
+of the format known as &quot;8.3&quot;). This is due to 
 limitations in the OS's handling of the <code>&quot;for&quot;</code> 
 batch-file statement. It is recommended, therefore, that Ant be 
-installed in a <b>short</b> path, such as C:\Ant.</i>
+installed in a <b>short</b>, 8.3 path, such as C:\Ant. </i>
+  </td>
+</tr>
+<tr>
+  <td width="5%">&nbsp;</td>
+  <td>
+    <p>On these systems you will also need to configure more environment
+       space to cater for the environment variables used in the Ant lauch script.
+       To do this, you will need to add or update the following line in 
+       the <code>config.sys</code> file
+    </p>
+    <p><code>shell=c:\command.com c:\ /p /e:32768</code></p>
   </td>
 </tr>
 </table>
 
+<h3>Setup</h3>
 <p>
 Before you can run ant there is some additional set up you 
 will need to do:</p>
diff --git a/docs/manual/running.html b/docs/manual/running.html
index 4886ad3bc..4292fe9e3 100644
--- a/docs/manual/running.html
+++ b/docs/manual/running.html
@@ -160,6 +160,18 @@ set):</p>
   to find, even if the file is called <code>build.xml</code>.
 </ul>
 
+<h2><a name="cygwin">Cygwin Users</a></h2>
+<p>The Unix launch script that come with Ant works correctly with Cygwin. You 
+should not have any problems launching Ant form the Cygwin shell. It is important 
+to note however, that once Ant is runing it is part of the JDK which operates as
+a native Windows application. The JDK is not a Cygwin executable, and it therefore 
+has no knowledge of the Cygwin paths, etc. In particular when using the &lt;exec&gt;
+task, executable names such as &quot;/bin/sh&quot; will not work, even though these 
+work from the Cygwin shell from which Ant was launched. You can use an executable 
+name such as &quot;sh&quot; and rely on that command being available in the Windows
+path.
+</p>
+
 <h2><a name="viajava">Running Ant via Java</a></h2>
 <p>If you have installed Ant in the do-it-yourself way, Ant can be started
 with:</p>
diff --git a/docs/manual/runninglist.html b/docs/manual/runninglist.html
index 62fbf5295..e9ad3ec27 100644
--- a/docs/manual/runninglist.html
+++ b/docs/manual/runninglist.html
@@ -15,6 +15,7 @@
 &nbsp;&nbsp;<a href="running.html#options">Options</a><br>
 &nbsp;&nbsp;<a href="running.html#files">Files</a><br>
 &nbsp;&nbsp;<a href="running.html#envvars">Environment Variables</a><br>
+&nbsp;&nbsp;<a href="running.html#cygwin">Cygwin Users</a><br>
 <a href="running.html#viajava">Running Ant via Java</a><br>
 
 </body>