diff --git a/core/manifest/ConfigStaticManifest.php b/core/manifest/ConfigStaticManifest.php
index 486871e10..3689f59c8 100644
--- a/core/manifest/ConfigStaticManifest.php
+++ b/core/manifest/ConfigStaticManifest.php
@@ -268,6 +268,9 @@ class SS_ConfigStaticManifest_Parser {
 			else if($type == ';' || $type == ',' || $type == '=') {
 				break;
 			}
+			else if($type == T_COMMENT || $type == T_DOC_COMMENT) {
+				// NOP
+			}
 			else {
 				user_error('Unexpected token when building static manifest: '.print_r($token, true), E_USER_ERROR);
 			}
@@ -315,9 +318,17 @@ class SS_ConfigStaticManifest_Parser {
 			$this->statics[$class] = array();
 		}
 
+		$value = trim($value);
+		if ($value) {
+			$value = eval('static $temp = '.$value.";\n".'return $temp'.";\n");
+		}
+		else {
+			$value = null;
+		}
+
 		$this->statics[$class][$variable] = array(
 			'access' => $access,
-			'value' => eval('return '.$value.';')
+			'value' => $value
 		);
 
 		if($token == ',') $this->parseStatic($access, $class);
diff --git a/tests/core/manifest/ConfigStaticManifestTest.php b/tests/core/manifest/ConfigStaticManifestTest.php
index ceaa13da1..5655599f6 100644
--- a/tests/core/manifest/ConfigStaticManifestTest.php
+++ b/tests/core/manifest/ConfigStaticManifestTest.php
@@ -20,9 +20,20 @@ class ConfigStaticManifestTest extends SapphireTest {
 	static $sfloat = 2.5;
 	static $sstring = 'string';
 	static $sarray = array(1, 2, array(3, 4), 5);
+	static $sheredoc = <<<DOC
+heredoc
+DOC;
+	static $snowdoc = <<<'DOC'
+nowdoc
+DOC;
 
 	// Assigning multiple values
-	static $onone, $onull = null, $oint = 1, $ofloat = 2.5, $ostring = 'string', $oarray = array(1, 2, array(3, 4), 5);
+	static $onone, $onull = null, $oint = 1, $ofloat = 2.5, $ostring = 'string', $oarray = array(1, 2, array(3, 4), 5), $oheredoc = <<<DOC
+heredoc
+DOC
+, $onowdoc = <<<'DOC'
+nowdoc
+DOC;
 
 	static
 		$mnone,
@@ -34,7 +45,25 @@ class ConfigStaticManifestTest extends SapphireTest {
 			1, 2,
 			array(3, 4),
 			5
-		);
+		),
+		$mheredoc = <<<DOC
+heredoc
+DOC
+		,
+		$mnowdoc = <<<'DOC'
+nowdoc
+DOC;
+
+
+	static /* Has comment inline */ $commented_int = 1, /* And here */ $commented_string = 'string';
+
+	static
+		/**
+		 * Has docblock inline
+		 */
+		$docblocked_int = 1,
+		/** And here */
+		$docblocked_string = 'string';
 
 	// Should ignore static methpds
 	static function static_method() {}
@@ -90,6 +119,8 @@ class ConfigStaticManifestTest extends SapphireTest {
 			'float',
 			'string',
 			'array',
+			'heredoc',
+			'nowdoc'
 		);
 
 		$prepends = array(
@@ -111,6 +142,16 @@ class ConfigStaticManifestTest extends SapphireTest {
 		}
 	}
 
+	public function testIgnoreComments() {
+		$statics = $this->parseSelf()->getStatics();
+
+		$this->assertEquals(self::$commented_int, $statics[__CLASS__]['commented_int']['value']);
+		$this->assertEquals(self::$commented_string, $statics[__CLASS__]['commented_string']['value']);
+
+		$this->assertEquals(self::$docblocked_int, $statics[__CLASS__]['docblocked_int']['value']);
+		$this->assertEquals(self::$docblocked_string, $statics[__CLASS__]['docblocked_string']['value']);
+	}
+
 	public function testIgnoresMethodStatics() {
 		$statics = $this->parseSelf()->getStatics();
 		$this->assertNull(@$statics[__CLASS__]['method_static']);