diff --git a/t3lib/class.t3lib_install.php b/t3lib/class.t3lib_install.php
index 096033c..e9e73af 100644
--- a/t3lib/class.t3lib_install.php
+++ b/t3lib/class.t3lib_install.php
@@ -142,6 +142,7 @@ class t3lib_install {
 		$comment = ' Modified or inserted by '.$this->updateIdentity.'.';
 		$replace = array('["', '"]');
 		$search = array('[\'', '\']');
+		$commentblock = false;
 		$varDoubleQuotes = str_replace($search, $replace, $variable);
 
 			// Search for variable name:
@@ -149,6 +150,17 @@ class t3lib_install {
 			$line_array = array_reverse($line_array);
 			foreach($line_array as $k => $v)	{
 				$v2 = trim($v);
+
+				if (($commentblock == false) && ($v2 == '*/')) {
+						$commentblock = true;
+				} elseif (($commentblock == true) && ($v2 == '/*')){
+						$commentblock = false;
+				}
+
+				if (($commentblock == true) || (preg_match('/^#/', $v2) == true)) {
+					$v2 = '';
+				}
+
 				if ($stopAtToken && !strcmp($v2,$commentKey.$this->localconf_editPointToken))	break;		// If stopAtToken and token found, break out of the loop..
 				if (!strcmp(substr($v2,0,strlen($variable.' ')),$variable.' '))	{
 					$mainparts = explode($variable,$v,2);