2 files changed, 11 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 6206279a4..57149db3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ openssh (1:5.2p1-1) UNRELEASED; urgency=low
     Michał Górny; closes: #505378, LP: #425346).
   * Use hardening-includes for hardening logic (thanks, Kees Cook; closes:
     #561887).
+  * Update OpenSSH FAQ to revision 1.110.
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 12 Nov 2009 21:31:44 +0000
 
diff --git a/debian/faq.html b/debian/faq.html
index 67d55cb52..812234d2f 100644
--- a/debian/faq.html
+++ b/debian/faq.html
@@ -29,6 +29,7 @@
 <li><a href= "#1.3">1.3 - What Operating Systems are supported?</a>
 <li><a href= "#1.4">1.4 - What about copyright, usage and patents?</a>
 <li><a href= "#1.5">1.5 - Where should I ask for help?</a>
+<li><a href= "#1.6">1.6 - I have found a bug. Where do I report it?</a>
 </ul>
 
 <h3><a href= "#2.0">2.0 - General Questions</a></h3>
@@ -264,9 +265,13 @@ put in searchable form and can be found at
 For more information on subscribing to OpenSSH related mailing lists, 
 please see <a href="http://www.openssh.org/list.html">OpenSSH Mailing lists</a>.
 
+<h2><a name= "1.6">1.6 - I have found a bug. Where do I report it?</a></h2>
 <p>
 Information about submitting bug reports can be found at the OpenSSH
 <a href="http://www.openssh.org/report.html">Reporting bugs</a> page.
+<p>
+If you wish to report a security bug, please contact the private developers
+list &lt;<a href="mailto:openssh@openssh.com">openssh@openssh.com</a>&gt;.
 
 <h2><u><a name= "2.0">2.0 - General Questions</a></u></h2>
 
@@ -535,7 +540,7 @@ implementations.
 
 <p>
 New features are more likely in sftp, since the protocol is standardized
-(well, a <a href="http://www.ietf.org/html.charters/secsh-charter.html">
+(well, a <a href="http://www.ietf.org/html.charters/OLD/secsh-charter.html">
 draft standard</a>), extensible, and the client and server are decoupled.
 
 <h2><a name= "2.11">2.11 - How do I use port forwarding?</a></h2>
@@ -659,8 +664,8 @@ SSH-2.0-OpenSSH_3.9
 This information is used by clients and servers to enable protocol 
 compatibility tweaks to work around changed, buggy or missing features in 
 the implementation they are talking to. This protocol feature checking is 
-still required at present because the SSH protocol has not been yet published 
-as a RFC and more incompatible changes may be made before this happens.
+still required at present because versions with incompatibilities are still
+in wide use.
 </p>
 
 <h2><u><a name= "3.0">3.0 - Portable OpenSSH Questions</a></u></h2>
@@ -1071,6 +1076,7 @@ In this case, it can be solved by executing the following on the server.
   <td nowrap bgcolor="#EEEEEE">
 $ <b>chmod go-w $HOME $HOME/.ssh</b><br>
 $ <b>chmod 600 $HOME/.ssh/authorized_keys</b>
+$ <b>chown `whoami` $HOME/.ssh/authorized_keys</b><br>
   </td>
 </tr>
 </table>
@@ -1170,7 +1176,7 @@ sshd on an AIX 5.x system and using that.
 <a href="http://www.openssh.org/index.html"><img height=24 width=24 src="back.gif" border=0 alt=OpenSSH></a>
 <a href="mailto:www@openbsd.org">www@openbsd.org</a>
 <br>
-<small>$OpenBSD: faq.html,v 1.107 2007/06/20 18:14:15 miod Exp $</small>
+<small>$OpenBSD: faq.html,v 1.110 2009/11/23 23:38:17 dtucker Exp $</small>
 
 </body>
 </html>