diff --git a/index.php b/index.php
index e5c2554914ea140a998c7d315549794f4a59299e..1a9d9603eef21d578a1fbd15917ab6756253221b 100644
--- a/index.php
+++ b/index.php
@@ -18,9 +18,14 @@ if(ini_get('session.save_handler') == 'user')
 	@ini_set('session.save_path', '');
 }
 
+define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__));
 if(!defined('PIWIK_INCLUDE_PATH'))
 {
 	define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
+	if(file_exists(PIWIK_INCLUDE_PATH . '/bootstrap.php'))
+	{
+		require_once PIWIK_INCLUDE_PATH . '/bootstrap.php';
+	}
 }
 
 if((@include "Version.php") === false || !class_exists('Piwik_Version', false))
diff --git a/piwik.php b/piwik.php
index c9386a0ed31c108ffced7e4dc288f29d330fedc2..fe64750728732b3b3af6346364a95605e68b5bfb 100644
--- a/piwik.php
+++ b/piwik.php
@@ -11,10 +11,16 @@ $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
 
 define('PIWIK_TRACKER_MODE', true);
 error_reporting(E_ALL|E_NOTICE);
+
 if(!defined('PIWIK_INCLUDE_PATH'))
 {
 	define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
+	if(file_exists(PIWIK_INCLUDE_PATH . '/bootstrap.php'))
+	{
+		require_once PIWIK_INCLUDE_PATH . '/bootstrap.php';
+	}
 }
+
 @ignore_user_abort(true);
 
 if((@include "Version.php") === false || !class_exists('Piwik_Version', false))