diff --git a/app/code/community/JeroenVermeulen/Solarium/Helper/Autoloader.php b/app/code/community/JeroenVermeulen/Solarium/Helper/Autoloader.php
new file mode 100644
index 0000000..5cae377
--- /dev/null
+++ b/app/code/community/JeroenVermeulen/Solarium/Helper/Autoloader.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * JeroenVermeulen_Solarium
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this Module to
+ * newer versions in the future.
+ *
+ * @category    JeroenVermeulen
+ * @package     JeroenVermeulen_Solarium
+ * @copyright   Copyright (c) 2014 Jeroen Vermeulen (http://www.jeroenvermeulen.eu)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class JeroenVermeulen_Solarium_Helper_Autoloader extends Mage_Core_Helper_Abstract
+{
+
+    /**
+     * Prepends our autoloader, so we can load the extra library classes when they are needed.
+     */
+    public function register() {
+        $registryKey = 'JeroenVermeulen_Solarium_Autoloader_registered';
+        if ( ! Mage::registry( $registryKey ) ) {
+            Mage::register( $registryKey, true );
+            spl_autoload_register( array( $this, 'load' ), true, true );
+        }
+    }
+
+    /**
+     * This function can autoload classes starting with:
+     * - Solarium
+     * - Symfony\Component\EventDispatcher
+     *
+     * @param string $class
+     */
+    public static function load( $class ) {
+        if ( preg_match( '#^(Solarium|Symfony\\\\Component\\\\EventDispatcher)\b#', $class ) ) {
+            $phpFile = Mage::getBaseDir( 'lib' ) . DIRECTORY_SEPARATOR
+                       . str_replace( '\\', DIRECTORY_SEPARATOR, $class ) . '.php';
+            /** @noinspection PhpIncludeInspection */
+            require_once( $phpFile );
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/code/community/JeroenVermeulen/Solarium/Model/Engine.php b/app/code/community/JeroenVermeulen/Solarium/Model/Engine.php
index 5eb7bc5..cd12a47 100644
--- a/app/code/community/JeroenVermeulen/Solarium/Model/Engine.php
+++ b/app/code/community/JeroenVermeulen/Solarium/Model/Engine.php
@@ -99,6 +99,8 @@ public static function getConf( $setting, $storeId = null ) {
      * @see https://github.com/basdenooijer/solarium/issues/254
      */
     public function __construct() {
+        // Make sure the autoloader is registered, because in Magento < 1.8 some events are missing.
+        Mage::helper( 'jeroenvermeulen_solarium/autoloader' )->register();
         $helper = Mage::helper( 'jeroenvermeulen_solarium' );
         if ( self::isEnabled() ) {
             $host           = trim( self::getConf( 'server/host' ) );
diff --git a/app/code/community/JeroenVermeulen/Solarium/Model/Observer/Autoloader.php b/app/code/community/JeroenVermeulen/Solarium/Model/Observer.php
similarity index 58%
rename from app/code/community/JeroenVermeulen/Solarium/Model/Observer/Autoloader.php
rename to app/code/community/JeroenVermeulen/Solarium/Model/Observer.php
index 0ff07d1..bc72bb3 100644
--- a/app/code/community/JeroenVermeulen/Solarium/Model/Observer/Autoloader.php
+++ b/app/code/community/JeroenVermeulen/Solarium/Model/Observer.php
@@ -20,9 +20,8 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class JeroenVermeulen_Solarium_Model_Observer_Autoloader extends Varien_Event_Observer
+class JeroenVermeulen_Solarium_Model_Observer extends Varien_Event_Observer
 {
-
     /**
      * This an observer function for the event 'controller_front_init_before'.
      * It prepends our autoloader, so we can load the extra libraries.
@@ -30,7 +29,7 @@ class JeroenVermeulen_Solarium_Model_Observer_Autoloader extends Varien_Event_Ob
      * @param Varien_Event_Observer $observer
      */
     public function controllerFrontInitBefore( /** @noinspection PhpUnusedParameterInspection */ $observer ) {
-        $this->_registerAutoLoader();
+        Mage::helper( 'jeroenvermeulen_solarium/autoloader' )->register();
     }
 
     /**
@@ -41,34 +40,7 @@ public function controllerFrontInitBefore( /** @noinspection PhpUnusedParameterI
      * @param Varien_Event_Observer $observer
      */
     public function shellReindexInitProcess( /** @noinspection PhpUnusedParameterInspection */ $observer ) {
-        $this->_registerAutoLoader();
-    }
-
-    /**
-     * This function can autoload classes starting with:
-     * - Solarium
-     * - Symfony\Component\EventDispatcher
-     *
-     * @param string $class
-     */
-    public static function load( $class ) {
-        if ( preg_match( '#^(Solarium|Symfony\\\\Component\\\\EventDispatcher)\b#', $class ) ) {
-            $phpFile = Mage::getBaseDir( 'lib' ) . DIRECTORY_SEPARATOR
-                       . str_replace( '\\', DIRECTORY_SEPARATOR, $class ) . '.php';
-            /** @noinspection PhpIncludeInspection */
-            require_once( $phpFile );
-        }
-    }
-
-    /**
-     * Prepends our autoloader, so we can load the extra libraries.
-     */
-    private function _registerAutoLoader() {
-        static $registered;
-        if ( empty( $registered ) ) {
-            $registered = true;
-            spl_autoload_register( array( $this, 'load' ), true, true );
-        }
+        Mage::helper( 'jeroenvermeulen_solarium/autoloader' )->register();
     }
 
 }
\ No newline at end of file
diff --git a/app/code/community/JeroenVermeulen/Solarium/etc/config.xml b/app/code/community/JeroenVermeulen/Solarium/etc/config.xml
index d751e26..b3f50b4 100644
--- a/app/code/community/JeroenVermeulen/Solarium/etc/config.xml
+++ b/app/code/community/JeroenVermeulen/Solarium/etc/config.xml
@@ -70,15 +70,16 @@
             <controller_front_init_before>
                 <observers>
                     <jeroenvermeulen_solarium_controller_front_init_before>
-                        <class>jeroenvermeulen_solarium/observer_autoloader</class>
+                        <class>jeroenvermeulen_solarium/observer</class>
                         <method>controllerFrontInitBefore</method>
                     </jeroenvermeulen_solarium_controller_front_init_before>
                 </observers>
             </controller_front_init_before>
             <shell_reindex_init_process>
+                <!-- This event only works for Magento >= 1.8 -->
                 <observers>
                     <jeroenvermeulen_solarium_shell_reindex_init_process>
-                        <class>jeroenvermeulen_solarium/observer_autoloader</class>
+                        <class>jeroenvermeulen_solarium/observer</class>
                         <method>shellReindexInitProcess</method>
                     </jeroenvermeulen_solarium_shell_reindex_init_process>
                 </observers>