diff --git a/doc/tor-doc-server.html b/doc/tor-doc-server.html
index d51fc4737a..12a4f186f9 100644
--- a/doc/tor-doc-server.html
+++ b/doc/tor-doc-server.html
@@ -95,6 +95,12 @@ low-bandwidth ones. Therefore having low-bandwidth servers is useful too.
 </li>
 </ul>
 
+<p>You can run a Tor server on
+pretty much any operating system, but see <a
+href="http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ServerOS">this
+FAQ entry</a> for advice about which ones work best and other problems
+you might encounter.</p>
+
 <hr />
 <a id="zero"></a>
 <h2><a class="anchor" href="#zero">Step Zero: Download and Install Tor</a></h2>