diff --git a/scripts/qa/extensions.xml.php b/scripts/qa/extensions.xml.php
index 99b413322..ab71a792d 100755
--- a/scripts/qa/extensions.xml.php
+++ b/scripts/qa/extensions.xml.php
@@ -83,6 +83,16 @@
 			$debug['bogus-membership'][] = array($ext, $m);
 	}
 
+	if (preg_match('/<!-- State: (\w+)/S', $file, $match)) {
+		switch ($match[1]) {
+		case 'experimental':
+		case 'deprecated':
+			$State[$match[1]][$ext] = 1;
+			break;
+                default:
+			$debug['bogus-state'][] = array($ext, $match[1]);
+		}
+	}
 }
 
 
@@ -166,6 +176,12 @@
 	print_r($debug['bogus-membership']);
 }
 
+if (isset($debug['bogus-state'])) {
+	echo "\nExtensions with bogus State:\n";
+	$status = 2;
+	print_r($debug['bogus-state']);
+}
+
 if (isset($debug['unknown-extension'])) {
 	echo "\nExtensions with unknown extension title:\n";
 	$status = 2;