diff --git a/CHANGES.rst b/CHANGES.rst
index 277d928..46ec110 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -20,9 +20,11 @@ Change History for ZConfig
 - Scripts ``zconfig`` (for schema validation) and
   ``zconfig_schema2html`` are ported to Python 3.
 
-- A new ``ZConfig.sphinx`` Sphinx extension facilitates automatically
-  documenting ZConfig components using their description and examples
-  in Sphinx documentation.
+- A new ``ZConfig.sphinx`` `Sphinx extension
+  <https://zconfig.readthedocs.io/en/latest/documenting-components.html#documenting-components>`_
+  facilitates automatically documenting ZConfig components using their
+  description and examples in Sphinx documentation. See
+  https://github.com/zopefoundation/ZConfig/pull/25.
 
 - Simplify internal schema processing of max and min occurrence
   values. See https://github.com/zopefoundation/ZConfig/issues/15.
diff --git a/MANIFEST.in b/MANIFEST.in
index 7c8f332..bdd971e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,8 @@
 include *.rst
 include *.txt
+include *.yml
+include .travis.yml
+include .coveragerc
 include tox.ini
 include bootstrap.py
 include buildout.cfg
@@ -8,6 +11,7 @@ recursive-include ZConfig *
 recursive-include doc *.py
 recursive-include doc *.rst
 recursive-include doc *.dtd
+recursive-include doc *.conf
 recursive-include doc Makefile
 recursive-include doc make.bat
 
diff --git a/setup.py b/setup.py
index a1d04b5..ae940a1 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@ def alltests():
     author_email="fred@fdrake.net",
     maintainer="Zope Foundation and Contributors",
     description="Structured Configuration Library",
+    keywords='configuration structured simple flexible typed hierarchy logging',
     long_description=README + "\n\n" + CHANGES,
     license="ZPL 2.1",
     url="https://github.com/zopefoundation/ZConfig/",
@@ -79,7 +80,7 @@ def alltests():
         'Programming Language :: Python :: Implementation :: PyPy',
         'Operating System :: OS Independent',
         'Topic :: Software Development',
-        ],
+    ],
     # Support for 'setup.py test' when setuptools is available:
     test_suite='__main__.alltests',
     tests_require=tests_require,