diff --git a/Doc/tools/listmodules b/Doc/tools/listmodules
index b00019982dc..e0c4fc600e7 100755
--- a/Doc/tools/listmodules
+++ b/Doc/tools/listmodules
@@ -66,7 +66,7 @@ def main():
             if data[:1] == "\\":
                 ignore_from_idx(data, ignore_dict)
             else:
-                ignore_from_filelist(data, ignore_dict)
+                ignore_from_modulelist(data, ignore_dict)
     if args or (annotate and categorize):
         usage()
         sys.exit(2)
@@ -135,13 +135,13 @@ def main():
         print string.join(modules, "\n")
 
 
-def ignore_from_filelist(data, ignore_dict):
+def ignore_from_modulelist(data, ignore_dict):
     for name in string.split(data):
         ignore_dict[name] = name
 
 def ignore_from_idx(data, ignore_dict):
     data = string.replace(data, r"\hackscore  {}", "_")
-    rx = re.compile(r"\indexentry {([^@]*)@")
+    rx = re.compile(r"\\indexentry\s*{([^@]*)@")
     for line in string.split(data, "\n"):
         m = rx.match(line)
         if m: