--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,4 @@
 exclude doc/2000ft.graffle
-exclude doc/docutils.conf
 recursive-exclude doc/logo.lineform *
-exclude doc/Makefile
 include doc/api/*.*
 include doc/*.html

--- a/genshi/template/base.py
+++ b/genshi/template/base.py
@@ -300,7 +300,8 @@
                         template was found
         :param filename: the name of the template file, relative to the given
                          base directory
-        :param loader: the `TemplateLoader` to use for load included templates
+        :param loader: the `TemplateLoader` to use for loading included
+                       templates
         :param encoding: the encoding of the `source`
         :param lookup: the variable lookup mechanism; either "lenient" (the
                        default), "strict", or a custom lookup class

--- a/setup.py
+++ b/setup.py
@@ -119,5 +119,5 @@
     genshi-text = genshi.template.plugin:TextTemplateEnginePlugin[plugin]
     """,
 
-    cmdclass={'build_doc': build_doc, 'test_doc': test_doc}
+    cmdclass = {'build_doc': build_doc, 'test_doc': test_doc}
 )