diff --git a/documentation/_templates/index.html b/documentation/_templates/index.html
index 7bb9de49c1..8ba1f920db 100644
--- a/documentation/_templates/index.html
+++ b/documentation/_templates/index.html
@@ -6,7 +6,7 @@ <h1>FiPy: A Finite Volume PDE Solver Using Python</h1>
   class="xref">FiPy</em></a> is an object oriented, partial differential
   equation (PDE) solver,
   written in <a class="reference external"
-  href="http://www.python.org/">Python</a>,
+  href="/cgi-bin/redirect.py?url=http://www.python.org/">Python</a>,
   based on a standard finite volume (FV) approach. The framework has been
   developed in the Materials Science and Engineering Division (<a class="reference external"
   href="http://www.nist.gov/mml/msed">MSED</a>) and Center
@@ -23,10 +23,10 @@ <h1>FiPy: A Finite Volume PDE Solver Using Python</h1>
   considerable resources repeatedly developing limited tools for specific
   problems. Our approach, combining the FV method and <a class="reference
   external"
-  href="http://www.python.org/">Python</a>,
+  href="/cgi-bin/redirect.py?url=http://www.python.org/">Python</a>,
   provides a tool that is extensible, powerful and freely available. A
   significant advantage to <a class="reference external"
-  href="http://www.python.org/">Python</a>
+  href="/cgi-bin/redirect.py?url=http://www.python.org/">Python</a>
   is the existing suite of tools for array calculations, sparse matrices
   and data rendering.</p>
   <p>The <a class="reference external"
@@ -54,8 +54,8 @@ <h1>FiPy: A Finite Volume PDE Solver Using Python</h1>
   <p>J. E. Guyer, D. Wheeler &amp; J. A. Warren,
   "FiPy: Partial Differential Equations with Python,"
   <em>Computing in Science &amp; Engineering</em> <strong>11</strong>(3) pp. 6&mdash;15 (2009),
-  <a href="http://dx.doi.org/10.1109/MCSE.2009.52"><code>doi:10.1109/MCSE.2009.52</code></a>,
-  <a href="http://www.ctcms.nist.gov/fipy"><code>http://www.ctcms.nist.gov/fipy</code></a></p>
+  <a href="/cgi-bin/redirect.py?url=http://dx.doi.org/10.1109/MCSE.2009.52"><code>doi:10.1109/MCSE.2009.52</code></a>,
+  <a href="/cgi-bin/redirect.py?url=http://www.ctcms.nist.gov/fipy"><code>http://www.ctcms.nist.gov/fipy</code></a></p>
   </div>
  {% block tables %}
    <h2>Documentation</h2>
@@ -103,18 +103,18 @@ <h2>Applications</h2>
      </td></tr>
    </table>
 
-   <h2><a href="http://matforge.org/fipy">FiPy@MatForge</a></h2>
+   <h2><a href="/cgi-bin/redirect.py?url=http://matforge.org/fipy">FiPy@MatForge</a></h2>
    <table class="contentstable" align="center"><tr>
      <td width="50%">
        <p class="biglink"><a class="biglink" 
-       href="http://matforge.org/fipy/wiki/FiPyDownloadCurrent">Download</a></p>
+       href="/cgi-bin/redirect.py?url=http://matforge.org/fipy/wiki/FiPyDownloadCurrent">Download</a></p>
        <p class="biglink"><a class="biglink" 
-       href="http://matforge.org/fipy/browser">Source Code</a></p>
+       href="/cgi-bin/redirect.py?url=http://matforge.org/fipy/browser">Source Code</a></p>
      </td><td width="50%">
        <p class="biglink"><a class="biglink" 
-       href="http://matforge.org/fipy">wiki</a></p>
+       href="/cgi-bin/redirect.py?url=http://matforge.org/fipy">wiki</a></p>
        <p class="biglink"><a class="biglink" 
-       href="http://matforge.org/fipy/report">Reporting Bugs</a></p>
+       href="/cgi-bin/redirect.py?url=http://matforge.org/fipy/report">Reporting Bugs</a></p>
      </td></tr>
    </table>
    
diff --git a/documentation/_templates/indexsidebar.html b/documentation/_templates/indexsidebar.html
index 5953654af0..be9a4cd9c5 100644
--- a/documentation/_templates/indexsidebar.html
+++ b/documentation/_templates/indexsidebar.html
@@ -27,7 +27,8 @@
 <div class="sphinxsidebarsection">
 <h3>Questions? Suggestions?</h3>
 
-<p>Join the <a href="{{ pathto('documentation/MAIL') }}">mailing list</a>
+<p>Join the <a href="{{ pathto('documentation/MAIL') }}">mailing list</a></p>
+<p>Recent mailing list traffic recorded at <a href="/cgi-bin/redirect.py?url=http://gmane.org">GMANE</a> (links leave NIST):
 <iframe src="http://blog.gmane.org/recent.php?group=gmane.comp.python.fipy&type=topics&content=subject&table.font-size=small" width="100%"></iframe>
 </p>
 <p>You can also open an issue at the