diff --git a/doc/darcs.html b/doc/darcs.html
index af83f62fc..433b89032 100644
--- a/doc/darcs.html
+++ b/doc/darcs.html
@@ -8,7 +8,7 @@
 <P ALIGN="center"><CENTER><H1>GF Darcs repository</H1>
 <FONT SIZE="4">
 <I>Author: Björn Bringert &lt;bringert@cs.chalmers.se&gt;</I><BR>
-Last update: Sun Sep  3 22:14:06 2006
+Last update: Wed Oct  3 15:13:24 2007
 </FONT></CENTER>
 
 <P></P>
@@ -190,6 +190,8 @@ push or pull, try upgrading to recent versions of darcs and OpenSSH
 (OpenSSH version 4 or newer).
 Recent OpenSSH versions include a connection multiplexing feature, which
 recent darcs versions support.
+Note that darcs 1.0.9 has some problems with this, try downgrading 
+to darcs 1.0.8.
 </P>
 <P>
 <B>Note: we seem to have some problems getting read-write access working smoothly on Windows.</B>
@@ -304,7 +306,12 @@ Try upgrading to a more recent version of darcs.
 <A NAME="toc18"></A>
 <H3>Using ssh ControlMaster</H3>
 <P>
-Get a recent darcs and OpenSSH, see above.
+Get a recent darcs and OpenSSH, see above. 
+</P>
+<P>
+Note that the ControlMaster feature does not seem to
+work properly in darcs 1.0.9 under Mac OS X. 
+Use darcs 1.0.8 instead.
 </P>
 <A NAME="toc19"></A>
 <H3>Using ssh-agent</H3>
@@ -405,6 +412,6 @@ posthook support.
 For more info about what you can do with darcs, see <A HREF="http://darcs.net/manual/">http://darcs.net/manual/</A>
 </P>
 
-<!-- html code generated by txt2tags 2.3 (http://txt2tags.sf.net) -->
-<!-- cmdline: txt2tags -t html -\-toc darcs.txt -->
+<!-- html code generated by txt2tags 2.4 (http://txt2tags.sf.net) -->
+<!-- cmdline: txt2tags darcs.txt -->
 </BODY></HTML>
diff --git a/doc/darcs.txt b/doc/darcs.txt
index eac168ab8..c88bad22c 100644
--- a/doc/darcs.txt
+++ b/doc/darcs.txt
@@ -141,6 +141,8 @@ push or pull, try upgrading to recent versions of darcs and OpenSSH
 (OpenSSH version 4 or newer).
 Recent OpenSSH versions include a connection multiplexing feature, which
 recent darcs versions support.
+Note that darcs 1.0.9 has some problems with this, try downgrading 
+to darcs 1.0.8.
 
 **Note: we seem to have some problems getting read-write access working smoothly on Windows.**
 If you figure out how to do this, let us know. If not, you can still use read-only access,
@@ -246,7 +248,11 @@ Try upgrading to a more recent version of darcs.
 
 === Using ssh ControlMaster ===
 
-Get a recent darcs and OpenSSH, see above.
+Get a recent darcs and OpenSSH, see above. 
+
+Note that the ControlMaster feature does not seem to
+work properly in darcs 1.0.9 under Mac OS X. 
+Use darcs 1.0.8 instead.
 
 
 === Using ssh-agent ===