diff --git a/NEWS b/NEWS
index f9858c0e..ca195210 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,8 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
-3.0.1, unknown release date
+3.1.0, unknown release date
+! Autoload support added
 - Autoclose now operates iteratively, i.e. <span><span><div> now has
   both span tags closed.
 . Plugins now get their own changelogs according to project conventions.
diff --git a/library/HTMLPurifier.auto.php b/library/HTMLPurifier.auto.php
index cb6a8426..3d312c53 100644
--- a/library/HTMLPurifier.auto.php
+++ b/library/HTMLPurifier.auto.php
@@ -6,4 +6,4 @@
 
 set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
 require_once 'HTMLPurifier.php';
-
+require_once 'HTMLPurifier.autoload.php';
diff --git a/library/HTMLPurifier.autoload.php b/library/HTMLPurifier.autoload.php
new file mode 100644
index 00000000..0babb71d
--- /dev/null
+++ b/library/HTMLPurifier.autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+if (function_exists('spl_autoload_register')) {
+  spl_autoload_register(array('HTMLPurifier', 'autoload'));
+} elseif (!function_exists('__autoload')) {
+  function __autoload($class) {return HTMLPurifier::autoload($class);}
+}
diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php
index ab464c4e..34d4e773 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -227,7 +227,21 @@ class HTMLPurifier
         return $htmlpurifier;
     }
     
+    /**
+     * Autoload function for HTML Purifier
+     * @param $class Class to load
+     */
+    public static function autoload($class) {
+        if (strncmp('HTMLPurifier', $class, 12) !== 0) return false;
+        // Language classes have an unusual directory structure
+        if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) {
+          $code = str_replace('_', '-', substr($class, 22));
+          require_once 'HTMLPurifier/Language/classes/' . $code . '.php';
+          return true;
+        }
+        require_once str_replace('_', '/', $class) . '.php';
+        return true;
+    }
+    
     
 }
-
-
diff --git a/library/HTMLPurifier/LanguageFactory.php b/library/HTMLPurifier/LanguageFactory.php
index 2a8fdf90..591d6060 100644
--- a/library/HTMLPurifier/LanguageFactory.php
+++ b/library/HTMLPurifier/LanguageFactory.php
@@ -109,12 +109,12 @@ class HTMLPurifier_LanguageFactory
             // PHP5/APC deps bug workaround can go here
             // you can bypass the conditional include by loading the
             // file yourself
-            if (file_exists($file) && !class_exists($class)) {
+            if (file_exists($file) && !class_exists($class, false)) {
                 include_once $file;
             }
         }
         
-        if (!class_exists($class)) {
+        if (!class_exists($class, false)) {
             // go fallback
             $fallback = HTMLPurifier_LanguageFactory::getFallbackFor($code);
             $depth++;
diff --git a/tests/generate_mock_once.func.php b/tests/generate_mock_once.func.php
index 1c74340b..e23b17f4 100644
--- a/tests/generate_mock_once.func.php
+++ b/tests/generate_mock_once.func.php
@@ -4,7 +4,7 @@
 // a little jumping through hoops to generate them
 function generate_mock_once($name) {
     $mock_name = $name . 'Mock';
-    if (class_exists($mock_name)) return false;
+    if (class_exists($mock_name, false)) return false;
     Mock::generate($name, $mock_name);
 }