diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4897535416..0a1ad6b4bb 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -95,6 +95,8 @@
 		<li>[Fix] Only display special ranks to guests; no longer display normal ranks for guests (Bug #36735)</li>
 		<li>[Fix] Properly treat punctuation marks after local urls (Bug #37055)</li>
 		<li>[Fix] Make searching for members by YIM address work in prosilver</li>
+		<li>[Change] Alllow applications to set custom module inclusion path (idea by HoL)</li>
+
 	</ul>
 
 	<a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3>
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 3f1c6b39e2..d0e7c8cfc8 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -28,11 +28,47 @@ class p_master
 	var $p_mode;
 	var $p_parent;
 
+	var $include_path = false;
 	var $active_module = false;
 	var $active_module_row_id = false;
 	var $acl_forum_id = false;
 	var $module_ary = array();
 
+	/**
+	* Constuctor
+	* Set module include path
+	*/
+	function p_master($include_path = false)
+	{
+		global $phpbb_root_path;
+
+		$this->include_path = ($include_path !== false) ? $include_path : $phpbb_root_path . 'includes/';
+
+		// Make sure the path ends with /
+		if (substr($this->include_path, -1) !== '/')
+		{
+			$this->include_path .= '/';
+		}
+	}
+
+	/**
+	* Set custom include path for modules
+	* Schema for inclusion is include_path . modulebase
+	*
+	* @param string $include_path include path to be used.
+	* @access public
+	*/
+	function set_custom_include_path($include_path)
+	{
+		$this->include_path = $include_path;
+
+		// Make sure the path ends with /
+		if (substr($this->include_path, -1) !== '/')
+		{
+			$this->include_path .= '/';
+		}
+	}
+
 	/**
 	* List modules
 	*
@@ -395,7 +431,7 @@ class p_master
 	{
 		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user;
 
-		$module_path = $phpbb_root_path . 'includes/' . $this->p_class;
+		$module_path = $this->include_path . $this->p_class;
 		$icat = request_var('icat', '');
 
 		if ($this->active_module === false)