diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index d3c2a9bf9e..78b6ea04c8 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -52,19 +52,20 @@ class p_master
 		// Sanitise for future path use, it's escaped as appropriate for queries
 		$this->p_class = str_replace(array('.', '/', '\\'), '', basename($p_class));
 		
-		$sql_and = '';
 		if (file_exists($phpbb_root_path . 'cache/' . $this->p_class . '_modules.' . $phpEx))
 		{
 			include($phpbb_root_path . 'cache/' . $this->p_class . '_modules.' . $phpEx);
 		}
 
+		/**
+		* @todo cache, see above. ;)
+		*/
 		$sql = 'SELECT *
 			FROM ' . MODULES_TABLE . "
 			WHERE module_class = '" . $db->sql_escape($p_class) . "'
 				AND module_enabled = 1
-				$sql_and
 			ORDER BY left_id ASC";
-		$result = $db->sql_query($sql);
+		$result = $db->sql_query($sql, 3600);
 
 		$right = $depth = $i = 0;
 		$depth_ary = array();
diff --git a/phpBB/style.php b/phpBB/style.php
index a402792e14..eff6566c55 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -66,7 +66,7 @@ if (!empty($_GET['id']) && !empty($_GET['sid']))
 				AND t.template_id = s.template_id
 				AND c.theme_id = s.theme_id
 				AND i.imageset_id = s.imageset_id";
-		$result2 = $db->sql_query($sql);
+		$result2 = $db->sql_query($sql, 300);
 
 		if (!($theme = $db->sql_fetchrow($result2)))
 		{