diff --git a/INSTALL b/INSTALL
index d01d9e2e..c46754a9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -81,6 +81,13 @@ when you use them.
 Only the contents in the library/ folder are necessary, so you can remove
 everything else when using HTML Purifier in a production environment.
 
+If you installed HTML Purifier via PEAR, all you need to do is:
+
+    require_once 'HTMLPurifier.auto.php';
+
+Please note that the usual PEAR practice of including just the classes you
+want will not work with HTML Purifier's autoloading scheme.
+
 Advanced users, read on; other users can skip to section 4.
 
 Autoload compatibility
diff --git a/TODO b/TODO
index c6addc81..11c4ad58 100644
--- a/TODO
+++ b/TODO
@@ -23,7 +23,6 @@ DOCUMENTATION
 
 IMPORTANT FEATURES
  - Factor out command line parser into its own class, and unit test it
- - Figure out autoload and PEAR
 
 NICE FEATURES
  - Factor demo.php into a set of Printer classes, and then create a stub
@@ -37,7 +36,6 @@ BUGS
  - Investigate iconv error emitting
  - Investigate UTF-8 optimization <http://htmlpurifier.org/phorum/read.php?3,1496>
  - Figure out what to do about target="" and name="", since they show up so often
- - Update htmLawed comparison
 
 FUTURE VERSIONS
 ---------------
diff --git a/package.php b/package.php
index 851fafb9..371e3b46 100644
--- a/package.php
+++ b/package.php
@@ -14,7 +14,11 @@ $pkg->setOptions(
         'filelistgenerator' => 'file',
         'include' => array('*'),
         'dir_roles' => array('/' => 'php'), // hack to put *.ser files in the right place
-        'ignore' => array('HTMLPurifier.auto.php', 'HTMLPurifier.standalone.php',  'HTMLPurifier.path.php', 'standalone/'),
+        'ignore' => array(
+            'HTMLPurifier.standalone.php',
+            'HTMLPurifier.path.php',
+            'standalone/'
+        ),
     )
 );