diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist
index 588907f2a..179fadc4e 100644
--- a/application/configs/application.ini.dist
+++ b/application/configs/application.ini.dist
@@ -171,8 +171,8 @@ resources.auth.oss.login_history.entity = "\\Entities\\UserLoginHistory"
 
 ;; Set this to wherever PEAR installed Doctrine. The given example is typical
 ;; for Ubuntu. For FreeBSD, try "/usr/local/share/pear/Doctrine/ORM"
-resources.doctrine2cache.path               = "/usr/share/php/Doctrine/ORM"
-resources.doctrine2cache.autoload_method    = "pear"
+;; resources.doctrine2cache.path               = "/usr/share/php/Doctrine/ORM"
+resources.doctrine2cache.autoload_method    = "composer"
 resources.doctrine2cache.namespace                          = 'IXPManager'
 ; resources.doctrine2cache.type                               = 'ArrayCache'
 resources.doctrine2cache.type                               = 'MemcacheCache'
diff --git a/bin/utils.inc b/bin/utils.inc
index 5685ba3f1..deafe8777 100755
--- a/bin/utils.inc
+++ b/bin/utils.inc
@@ -21,6 +21,8 @@
  * http://www.gnu.org/licenses/gpl-2.0.html
  */
 
+require_once( '../vendor/autoload.php' );
+
 // load version information
 require_once( dirname( __FILE__ ) . '/../library/IXP/Version.php' );    
 
diff --git a/public/index.php b/public/index.php
index 61867a8ea..fc7009037 100644
--- a/public/index.php
+++ b/public/index.php
@@ -39,6 +39,8 @@
 // let's time how long it takes to execute
 define( 'APPLICATION_STARTTIME', microtime( true ) );
 
+require_once( '../vendor/autoload.php' );
+
 // Define path to application directory
 defined('APPLICATION_PATH')
     || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application'));