--- htdocs/index.php	(revision 3496)
+++ htdocs/index.php	(working copy)
@@ -60,6 +60,7 @@
  *
  * We look for the undefined class in the following folders:
  * - /system/classes/*.php
+ * - /system/handlers/*.php
  * - /user/classes/*.php
  * - /user/sites/x.y.z/classes/*.php
  *
@@ -74,13 +75,16 @@
 	if ( empty($files) ) {
 		$files = array();
 		$dirs = array( HABARI_PATH . '/system', HABARI_PATH . '/user' );
+		$subdirs = array( '/classes', '/handlers' );
 
 		// For each directory, save the available files in the $files array.
 		foreach ($dirs as $dir) {
-			$glob = glob( $dir . '/classes/*.php' );
-			if ( $glob === false || empty( $glob ) ) continue;
-			$fnames = array_map(create_function('$a', 'return strtolower(basename($a));'), $glob);
-			$files = array_merge($files, array_combine($fnames, $glob));
+			foreach ($subdirs as $subdir) {
+				$glob = glob( $dir . $subdir . '/*.php' );
+				if ( $glob === false || empty( $glob ) ) continue;
+				$fnames = array_map(create_function('$a', 'return strtolower(basename($a));'), $glob);
+				$files = array_merge($files, array_combine($fnames, $glob));
+			}
 		}
 
 		// Load the Site class, a requirement to get files from a multisite directory.