diff --git a/doc/darcs.html b/doc/darcs.html
index e61f3b00c..fb6c4e970 100644
--- a/doc/darcs.html
+++ b/doc/darcs.html
@@ -40,14 +40,15 @@ GF has now been moved to a Darcs repository. No changes should be committed to t
     <LI><A HREF="#toc18">I get the error "darcs not found" when pushing</A>
     <LI><A HREF="#toc19">I get the error "(sftp) failed to fetch files."</A>
     <LI><A HREF="#toc20">I get the error "Not a repository: gfreposerver:..."</A>
-    <LI><A HREF="#toc21">How do I avoid typing in my password so many times?</A>
+    <LI><A HREF="#toc21">I'm using Cygwin and I get "mm_receive_fd: no fd"</A>
+    <LI><A HREF="#toc22">How do I avoid typing in my password so many times?</A>
       <UL>
-      <LI><A HREF="#toc22">Using ssh ControlMaster</A>
-      <LI><A HREF="#toc23">Using ssh-agent</A>
+      <LI><A HREF="#toc23">Using ssh ControlMaster</A>
+      <LI><A HREF="#toc24">Using ssh-agent</A>
       </UL>
     </UL>
-  <LI><A HREF="#toc24">Technical Information</A>
-  <LI><A HREF="#toc25">Further information about Darcs</A>
+  <LI><A HREF="#toc25">Technical Information</A>
+  <LI><A HREF="#toc26">Further information about Darcs</A>
   </UL>
 
 <P></P>
@@ -343,13 +344,35 @@ connection running. Start a master connection:
 or use the <CODE>darcs-cm</CODE> script shown above.
 </P>
 <A NAME="toc21"></A>
-<H2>How do I avoid typing in my password so many times?</H2>
+<H2>I'm using Cygwin and I get "mm_receive_fd: no fd"</H2>
+<P>
+It seems like ssh connection multiplexing doesn't work under Cygwin:
+<A HREF="http://www.mail-archive.com/cygwin@cygwin.com/msg61323.html">http://www.mail-archive.com/cygwin@cygwin.com/msg61323.html</A>.
+</P>
+<P>
+The workaround is to use password authentication. Just remove the
+ControlPath line in <CODE>.ssh/config</CODE>, and don't setup a ControlMaster
+connection (and don't use darcs-cm).
+</P>
+<P>
+You should then be able to checkout using just:
+</P>
+<PRE>
+  $ darcs get --partial --set-scripts-executable gfreposerver:/users/cs/www/Research/Language-technology/darcs/GF/
+</PRE>
+<P></P>
+<P>
+The problem is that when you pull and push, you have to enter your
+password quite a few times.
+</P>
 <A NAME="toc22"></A>
+<H2>How do I avoid typing in my password so many times?</H2>
+<A NAME="toc23"></A>
 <H3>Using ssh ControlMaster</H3>
 <P>
 See above.
 </P>
-<A NAME="toc23"></A>
+<A NAME="toc24"></A>
 <H3>Using ssh-agent</H3>
 <P>
 <B>NOTE: the method below will not work with <CODE>momo.medic.chalmers.se</CODE></B>.
@@ -412,7 +435,7 @@ Try to use it to log in (with your own username again):
   zsh:bringert:[~]&gt;
 </PRE>
 <P></P>
-<A NAME="toc24"></A>
+<A NAME="toc25"></A>
 <H1>Technical Information</H1>
 <P>
 This section contains information about how the repository is set
@@ -442,7 +465,7 @@ The repo has this in <CODE>_darcs/prefs/defaults</CODE>:
 The server which we push to has darcs 1.0.4, which is needed for
 posthook support.
 </P>
-<A NAME="toc25"></A>
+<A NAME="toc26"></A>
 <H1>Further information about Darcs</H1>
 <P>
 For more info about what you can do with darcs, see <A HREF="http://darcs.net/manual/">http://darcs.net/manual/</A>
diff --git a/doc/darcs.txt b/doc/darcs.txt
index 35903ed08..90962a6d1 100644
--- a/doc/darcs.txt
+++ b/doc/darcs.txt
@@ -274,6 +274,24 @@ $ ssh -M gfreposerver
 
 or use the ``darcs-cm`` script shown above.
 
+== I'm using Cygwin and I get "mm_receive_fd: no fd" ==
+
+It seems like ssh connection multiplexing doesn't work under Cygwin:
+http://www.mail-archive.com/cygwin@cygwin.com/msg61323.html.
+
+The workaround is to use password authentication. Just remove the
+ControlPath line in ``.ssh/config``, and don't setup a ControlMaster
+connection (and don't use darcs-cm).
+
+You should then be able to checkout using just:
+
+```
+$ darcs get --partial --set-scripts-executable gfreposerver:/users/cs/www/Research/Language-technology/darcs/GF/
+```
+
+The problem is that when you pull and push, you have to enter your
+password quite a few times.
+
 
 == How do I avoid typing in my password so many times? ==