diff --git a/doc/tor-doc-osx.html b/doc/tor-doc-osx.html
index 8fbeccb299..62b42cbffb 100644
--- a/doc/tor-doc-osx.html
+++ b/doc/tor-doc-osx.html
@@ -11,10 +11,13 @@
 
 <body>
 
-<h1>Running <a href="http://tor.eff.org/">Tor</a> on Mac OS X</h1>
+<h1>Running the <a href="http://tor.eff.org/">Tor</a> client on Mac OS X</h1>
 
 <a name="installing"></a>
 <h2>Step One: Download and Install Tor</h2>
+<p>
+<b>Note that this is the installation instructions for running a client on Mac OS X. If you want to run a server, please read the "Configuring a server" section in <a href="./tor-doc.html">tor-doc.html</a>.</b>
+</p>
 
 <p>
 The latest beta release of Tor for Macintosh OS X is <a
diff --git a/doc/tor-doc-win32.html b/doc/tor-doc-win32.html
index efab1b9372..1b184173a9 100644
--- a/doc/tor-doc-win32.html
+++ b/doc/tor-doc-win32.html
@@ -9,10 +9,13 @@
 
 <body>
 
-<h1>Running <a href="http://tor.eff.org/">Tor</a> on Win32</h1>
+<h1>Running the <a href="http://tor.eff.org/">Tor</a> client on Win32</h1>
 
 <a name="installing"></a>
 <h2>Step One: Download and Install Tor</h2>
+<p>
+<b>Note that this is the installation instructions for running a client on Win32. If you want to run a server, please read the "Configuring a server" section in <a href="./tor-doc.html">tor-doc.html</a>.</b>
+</p>
 
 <p>
 The latest stable release of Tor for Windows 32 is <a
diff --git a/doc/tor-doc.html b/doc/tor-doc.html
index 6395bd39ae..a2e0547bed 100644
--- a/doc/tor-doc.html
+++ b/doc/tor-doc.html
@@ -158,6 +158,11 @@ href="tor-doc-win32.html">these instructions</a> for help with
 installing, configuring, and using Tor on Win32.
 </p>
 
+<p>Mac OS X users can use our Tor installer. See <a
+href="tor-doc-osx.html">these instructions</a> for help with
+installing, configuring, and using Tor on Mac OS X.
+</p>
+
 <p>You can get the latest releases <a
 href="http://tor.eff.org/dist/">here</a>.</p>
 
