diff --git a/docs/index.html b/docs/index.html
index 3ebc8c2..a60c29f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -38,6 +38,7 @@
 <li><a href="http://bitworking.org/projects/httplib2/">httplib2</a></li>
 <li><a href="http://www.w3.org/TR/xslt">XSLT</a></li>
 <li><a href="http://www.gnu.org/software/sed/manual/html_mono/sed.html">sed</a></li>
+<li><a href="http://www.djangoproject.com/documentation/templates/">Django templates</a></li>
 </ul>
 </li>
 <li>Credits and License
diff --git a/docs/installation.html b/docs/installation.html
index 6a668d1..d8edf98 100644
--- a/docs/installation.html
+++ b/docs/installation.html
@@ -107,6 +107,15 @@ not yet ported to the newer python so Venus will be less featureful.
 
 <blockquote><pre>sudo apt-get install bzr python2.4-librdf</pre></blockquote>
 
+<h3 id="windows">Windows instructions</h3>
+
+<p>
+  htmltmpl templates (and Django too, since it currently piggybacks on
+  the htmltmpl implementation) on Windows require
+  the <a href="http://sourceforge.net/projects/pywin32/">pywin32</a>
+  module.
+</p>
+
 <h3 id="python22">Python 2.2 instructions</h3>
 
 <p>If you are running Python 2.2, you may also need to install <a href="http://pyxml.sourceforge.net/">pyxml</a>.  If the
diff --git a/tests/test_filters.py b/tests/test_filters.py
index fc61e47..58177fc 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -111,11 +111,17 @@ class FilterTests(unittest.TestCase):
 try:
     from subprocess import Popen, PIPE
 
-    sed=Popen(['sed','--version'],stdout=PIPE,stderr=PIPE)
-    sed.communicate()
-    if sed.returncode != 0:
+    try:
+        sed = Popen(['sed','--version'],stdout=PIPE,stderr=PIPE)
+        sed.communicate()
+        if sed.returncode != 0:
+            _no_sed = True
+    except WindowsError:
+        _no_sed = True
+
+    if _no_sed:
         logger.warn("sed is not available => can't test stripAd_yahoo")
-        del FilterTests.test_stripAd_yahoo
+        del FilterTests.test_stripAd_yahoo      
 
     try:
         import libxml2