diff --git a/TODO-RELEASE b/TODO-RELEASE
index 3d2d4bbdf1bde0a6e989cae0ac442272c0d4e0c1..4f7858aa7240cebe7309833c82ea8e53fc4dbd1f 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -8,9 +8,6 @@ To be addressed in 7.19.5 (planned release: May 2009)
       - reviewed
       - awaiting patch rework/breakdown
 
-235 - #2784055, connect race with multi and socks proxy
-      Code adjustment for FTP over socks proxy remains
-
 236 - timeout in milliseconds doesn't seem to work
       http://curl.haxx.se/mail/lib-2009-05/0021.html
 
@@ -21,3 +18,6 @@ To be addressed in 7.19.6 (planned release: July 2009)
 
 226 - Active Mode FTPS Data Port Range
 
+235 - KNOWN_BUG #65
+      Code adjustment for FTP over socks proxy remains
+
diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS
index 47d256e42adad961ce85066cd5e65bcc27ff627f..2e3ab82d5f47b04d811c0fe8a12c3a69b9f1683b 100644
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -3,6 +3,12 @@ join in and help us correct one or more of these! Also be sure to check the
 changelog of the current development status, as one or more of these problems
 may have been fixed since this was written!
 
+65. When doing FTP over a socks proxy or CONNECT through HTTP proxy and the
+  multi interface is used, libcurl will fail if the (passive) TCP connection
+  for the data transfer isn't more or less instant as the code does not
+  properly wait for the connect to be confirmed. See test case 564 for a first
+  shot at a test case.
+
 64. The threaded resolver used in libcurl on Windows has some kind of race
   problem when multiple simultanoes resolves are done, like with the multi
   interface transferring many files in parallell: