--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Version 0.4
 http://svn.edgewall.org/repos/genshi/tags/0.4.0/
-(?, from branches/stable/0.4.x)
+(Apr 16 2007, from branches/stable/0.4.x)
 
  * New example applications for CherryPy and web.py.
  * The template loader now uses a LRU cache to limit the number of cached

--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -4,11 +4,12 @@
 Upgrading from Genshi 0.3.x to 0.4.x
 ------------------------------------
 
-The `genshi.template` module has been refactored into a package with
-multiple modules. While code using the normal templating APIs should
-continue to work without problems, you should make sure to remove any
-leftover traces of the `template.py` file on the installation path.
-This is not necessary when Genshi was installed as a Python egg.
+The modules ``genshi.filters`` and ``genshi.template`` have been
+refactored into packages containing multiple modules. While code using
+the regular APIs should continue to work without problems, you should
+make sure to remove any leftover traces of the ``template.py`` file on
+the installation path. This is not necessary when Genshi was installed
+as a Python egg.
 
 Results of evaluating template expressions are no longer implicitly
 called if they are callable. If you have been using that feature, you

--- a/setup.py
+++ b/setup.py
@@ -84,10 +84,10 @@
     version = '0.4',
     description = 'A toolkit for stream-based generation of output for the web',
     long_description = \
-"""Genshi is a Python library that provides an integrated set of components
-for parsing, generating, and processing HTML, XML or other textual content for
-output generation on the web. The major feature is a template language, which
-is heavily inspired by Kid.""",
+"""Genshi is a Python library that provides an integrated set of
+components for parsing, generating, and processing HTML, XML or
+other textual content for output generation on the web. The major
+feature is a template language, which is heavily inspired by Kid.""",
     author = 'Edgewall Software',
     author_email = 'info@edgewall.org',
     license = 'BSD',
@@ -108,7 +108,7 @@
         'Topic :: Text Processing :: Markup :: XML'
     ],
     keywords = ['python.templating.engines'],
-    packages = ['genshi', 'genshi.template'],
+    packages = ['genshi', 'genshi.filters', 'genshi.template'],
     test_suite = 'genshi.tests.suite',
 
     extras_require = {'plugin': ['setuptools>=0.6a2']},