diff --git a/ChangeLog b/ChangeLog
index f85cfe6fab..7ad49b5a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 20 17:53:29 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* docs/remote.html docs/remote.html.in: patch from Kenneth Nagin
+	  with Notes on the use of listen_tls/listen_tcp
+
 Fri May 16 18:53:12 CEST 2008 Jim Meyering <meyering@redhat.com>
 
 	plug two leaks
diff --git a/docs/remote.html b/docs/remote.html
index ec7714514b..aca3f47f80 100644
--- a/docs/remote.html
+++ b/docs/remote.html
@@ -595,8 +595,12 @@ Blank lines and comments beginning with <code>#</code> are ignored.
         <p>The following settings, values and default are:</p>
         <table class="top_table"><tr><th> Line </th><th> Default </th><th> Meaning </th></tr><tr><td> listen_tls <i>[0|1]</i> </td><td> 1 (on) </td><td>
   Listen for secure TLS connections on the public TCP/IP port.
+  Note: it is also necessary to start the server in listening mode by
+  running it with --listen or editing /etc/sysconfig/libvirtd by uncommenting the LIBVIRTD_ARGS="--listen" line
+  to cause the server to come up in listening mode whenever it is started.
 </td></tr><tr><td> listen_tcp <i>[0|1]</i> </td><td> 0 (off) </td><td>
   Listen for unencrypted TCP connections on the public TCP/IP port.
+  Note: it is also necessary to start the server in listening mode.
 </td></tr><tr><td> tls_port <i>"service"</i> </td><td> "16514" </td><td>
   The port number or service name to listen on for secure TLS connections.
 </td></tr><tr><td> tcp_port <i>"service"</i> </td><td> "16509" </td><td>
diff --git a/docs/remote.html.in b/docs/remote.html.in
index 4803d397bb..907dcf4215 100644
--- a/docs/remote.html.in
+++ b/docs/remote.html.in
@@ -652,6 +652,9 @@ Blank lines and comments beginning with <code>#</code> are ignored.
         <td> 1 (on) </td>
         <td>
   Listen for secure TLS connections on the public TCP/IP port.
+  Note: it is also necessary to start the server in listening mode by
+  running it with --listen or editing /etc/sysconfig/libvirtd by uncommenting the LIBVIRTD_ARGS="--listen" line
+  to cause the server to come up in listening mode whenever it is started.
 </td>
       </tr>
       <tr>
@@ -659,6 +662,7 @@ Blank lines and comments beginning with <code>#</code> are ignored.
         <td> 0 (off) </td>
         <td>
   Listen for unencrypted TCP connections on the public TCP/IP port.
+  Note: it is also necessary to start the server in listening mode.
 </td>
       </tr>
       <tr>