Index: typo3/sysext/cms/locallang_tca.xml
===================================================================
--- typo3/sysext/cms/locallang_tca.xml	(revision 6913)
+++ typo3/sysext/cms/locallang_tca.xml	(working copy)
@@ -123,6 +123,7 @@
 			<label index="sys_template.static_file_mode.0">Default (Include before if Root-flag is set)</label>
 			<label index="sys_template.static_file_mode.1">Always include before this template record</label>
 			<label index="sys_template.static_file_mode.2">Never include before this template record</label>
+			<label index="sys_template.static_file_mode.3">Include before static and static from extensions if Root-flag is set</label>
 			<label index="sys_template.basedOn_add">Add new basis template</label>
 			<label index="sys_template.tabs.files">Resources</label>
 			<label index="sys_template.tabs.include">Includes</label>
Index: typo3/sysext/cms/tbl_cms.php
===================================================================
--- typo3/sysext/cms/tbl_cms.php	(revision 6913)
+++ typo3/sysext/cms/tbl_cms.php	(working copy)
@@ -982,6 +982,7 @@
 					array('LLL:EXT:cms/locallang_tca.xml:sys_template.static_file_mode.0', '0'),
 					array('LLL:EXT:cms/locallang_tca.xml:sys_template.static_file_mode.1', '1'),
 					array('LLL:EXT:cms/locallang_tca.xml:sys_template.static_file_mode.2', '2'),
+					array('LLL:EXT:cms/locallang_tca.xml:sys_template.static_file_mode.3', '3'),
 				),
 				'default' => '0'
 			)
Index: t3lib/class.t3lib_tstemplate.php
===================================================================
--- t3lib/class.t3lib_tstemplate.php	(revision 6913)
+++ t3lib/class.t3lib_tstemplate.php	(working copy)
@@ -647,6 +647,11 @@
 	 * @see processTemplate()
 	 */
 	function includeStaticTypoScriptSources($idList,$templateID,$pid,$row)	{
+		
+		if ($row['static_file_mode']==3 && substr($templateID,0,4)=='sys_' && $row['root']) {
+			$this->addExtensionStatics($idList,$templateID,$pid,$row);
+		}
+		
 			// Static Template Records (static_template): include_static is a list of static templates to include
 		if (trim($row['include_static']))	{
 			$include_staticArr = t3lib_div::intExplode(',', $row['include_static']);
@@ -691,7 +696,9 @@
 			}
 		}
 
-		$this->addExtensionStatics($idList,$templateID,$pid,$row);
+		if ($row['static_file_mode']==1 || ($row['static_file_mode']==0 && substr($templateID,0,4)=='sys_' && $row['root']))	{
+			$this->addExtensionStatics($idList,$templateID,$pid,$row);
+		}
 	}
 
 	/**
@@ -708,21 +715,19 @@
 	function addExtensionStatics($idList,$templateID,$pid,$row) {
 		global $TYPO3_LOADED_EXT;
 
-		if ($row['static_file_mode']==1 || ($row['static_file_mode']==0 && substr($templateID,0,4)=='sys_' && $row['root']))	{
-			foreach ($TYPO3_LOADED_EXT as $extKey => $files) {
-				if (is_array($files) && ($files['ext_typoscript_constants.txt'] || $files['ext_typoscript_setup.txt'] || $files['ext_typoscript_editorcfg.txt']))	{
-					$mExtKey = str_replace('_','',$extKey);
-					$subrow=array(
-						'constants'=>	$files['ext_typoscript_constants.txt']?t3lib_div::getUrl($files['ext_typoscript_constants.txt']):'',
-						'config'=>		$files['ext_typoscript_setup.txt']?t3lib_div::getUrl($files['ext_typoscript_setup.txt']):'',
-						'editorcfg'=>		$files['ext_typoscript_editorcfg.txt']?t3lib_div::getUrl($files['ext_typoscript_editorcfg.txt']):'',
-						'title' => 		$extKey,
-						'uid' => 		$mExtKey
-					);
-					$subrow = $this->prependStaticExtra($subrow);
+		foreach ($TYPO3_LOADED_EXT as $extKey => $files) {
+			if (is_array($files) && ($files['ext_typoscript_constants.txt'] || $files['ext_typoscript_setup.txt'] || $files['ext_typoscript_editorcfg.txt']))	{
+				$mExtKey = str_replace('_','',$extKey);
+				$subrow=array(
+					'constants'=>	$files['ext_typoscript_constants.txt']?t3lib_div::getUrl($files['ext_typoscript_constants.txt']):'',
+					'config'=>		$files['ext_typoscript_setup.txt']?t3lib_div::getUrl($files['ext_typoscript_setup.txt']):'',
+					'editorcfg'=>		$files['ext_typoscript_editorcfg.txt']?t3lib_div::getUrl($files['ext_typoscript_editorcfg.txt']):'',
+					'title' => 		$extKey,
+					'uid' => 		$mExtKey
+				);
+				$subrow = $this->prependStaticExtra($subrow);
 
-					$this->processTemplate($subrow,$idList.',ext_'.$mExtKey,$pid, 'ext_'.$mExtKey,$templateID);
-				}
+				$this->processTemplate($subrow,$idList.',ext_'.$mExtKey,$pid, 'ext_'.$mExtKey,$templateID);
 			}
 		}
 	}