diff --git a/mozilla/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp
index 928389eea3e..2d89c0faf96 100644
--- a/mozilla/chrome/src/nsChromeRegistry.cpp
+++ b/mozilla/chrome/src/nsChromeRegistry.cpp
@@ -1784,6 +1784,9 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
   while (nsnull != (token = nsCRT::strtok(newline, kNewlines, &newline))) {
     ++line;
 
+    if (*token == '#') // ignore lines that begin with # as comments
+      continue;
+
     char *whitespace = token;
     token = nsCRT::strtok(whitespace, kWhitespace, &whitespace);
     if (!token) continue;