diff --git a/doc/faq.but b/doc/faq.but
index b54eed10..38531386 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,4 +1,4 @@
-\versionid $Id: faq.but,v 1.21 2002/02/12 11:07:07 simon Exp $
+\versionid $Id: faq.but,v 1.22 2002/03/24 13:42:30 jacob Exp $
 
 \A{faq} PuTTY FAQ
 
@@ -683,6 +683,30 @@ You should still read the
 page} on the PuTTY website (also provided as \k{feedback} in the
 manual), and follow the guidelines contained in that.
 
+\S{faq-broken-openssh31}{Question} Since my SSH server was upgraded to
+OpenSSH 3.1p1, I can no longer connect with PuTTY.
+
+There is a known problem when OpenSSH has been built against an
+incorrect version of OpenSSL; the quick workaround is to configure
+PuTTY to use SSH protocol 2 and the Blowfish cipher.
+
+This is not a PuTTY-specific problem; if you try to connect with
+another client you'll likely have similar problems.
+
+Configurations known to be broken and symptoms:
+
+\b SSH 2 with AES cipher (PuTTY says "Assertion failed! Expression:
+(len & 15) == 0" in sshaes.c, or "Out of memory", or crashes)
+
+\b SSH 1 with Blowfish (PuTTY says "Incorrect CRC received on
+packet")
+
+\b SSH 1 with 3DES
+
+For more details and OpenSSH patches, see
+\W{http://bugzilla.mindrot.org/show_bug.cgi?id=138}{bug 138} in the
+OpenSSH BTS.
+
 \H{faq-secure} Security questions
 
 \S{faq-publicpc}{Question} Is it safe for me to download PuTTY and