diff --git a/README.rst b/README.rst
index f5fbab6b..1e905883 100644
--- a/README.rst
+++ b/README.rst
@@ -65,6 +65,13 @@ these files come from.
 Release notes
 =============
 
+0.4
+---
+
+ * New option --exceptions-file to pass list of files to ignore
+   completely
+ * Major improvements for automatic generation of option tables
+
 0.3
 ---
 
diff --git a/doc/source/man/openstack-doc-test.rst b/doc/source/man/openstack-doc-test.rst
index b4c6f647..883b09e0 100644
--- a/doc/source/man/openstack-doc-test.rst
+++ b/doc/source/man/openstack-doc-test.rst
@@ -59,6 +59,9 @@ OPTIONS
       Directory to ignore for building of manuals. The parameter can
       be passed multiple times to add several directories.
 
+  **--exceptions-file EXCEPTIONS_FILE**
+      File that contains filenames that will be skipped during validation.
+
 FILES
 =====
 
@@ -72,4 +75,6 @@ SEE ALSO
 Bugs
 ====
 
-* openstack-doc-tools is hosted on Launchpad so you can view current bugs at `Bugs : openstack-manuals <https://bugs.launchpad.net/openstack-manuals/>`__
+* openstack-doc-tools is hosted on Launchpad so you can view current
+  bugs at
+  `Bugs : openstack-manuals <https://bugs.launchpad.net/openstack-manuals/>`__
diff --git a/os_doc_tools/doctest.py b/os_doc_tools/doctest.py
index 617ddd3c..e1ee45ea 100755
--- a/os_doc_tools/doctest.py
+++ b/os_doc_tools/doctest.py
@@ -690,8 +690,8 @@ def is_book_master(filename):
             filename == 'openstack-glossary.xml')
 
 
-def find_affected_books(rootdir, book_exceptions, verbose,
-                        force, ignore_dirs):
+def find_affected_books(rootdir, book_exceptions, file_exceptions,
+                        verbose, force, ignore_dirs):
     """Check which books are affected by modified files.
 
     Returns a set with books.
@@ -754,7 +754,8 @@ def find_affected_books(rootdir, book_exceptions, verbose,
                 book_bk[f_abs] = book_root
             if (f.endswith('.xml') and
                     f != "pom.xml" and
-                    f != "ha-guide-docinfo.xml"):
+                    f != "ha-guide-docinfo.xml" and
+                    f not in file_exceptions):
                 try:
                     doc = etree.parse(f_abs)
                 except etree.XMLSyntaxError as e:
@@ -824,7 +825,7 @@ def find_affected_books(rootdir, book_exceptions, verbose,
     return books
 
 
-def build_affected_books(rootdir, book_exceptions,
+def build_affected_books(rootdir, book_exceptions, file_exceptions,
                          verbose, force=False, ignore_errors=False,
                          ignore_dirs=[]):
     """Build all the books which are affected by modified files.
@@ -838,7 +839,8 @@ def build_affected_books(rootdir, book_exceptions,
     """
 
     books = find_affected_books(rootdir, book_exceptions,
-                                verbose, force, ignore_dirs)
+                                file_exceptions, verbose,
+                                force, ignore_dirs)
 
     # Remove cache content which can cause build failures
     shutil.rmtree(os.path.expanduser("~/.fop"),
@@ -881,6 +883,17 @@ def build_affected_books(rootdir, book_exceptions,
         print("Building of books finished successfully.\n")
 
 
+def parse_exceptions(exceptions_file, verbose):
+    """Read list of exceptions from exceptions_file."""
+
+    for line in open(exceptions_file, 'rU'):
+        if not line.startswith("#") and len(line) > 1:
+            filename = line.rstrip('\n\r')
+            if verbose:
+                print("Adding file to ignore list: %s" % filename)
+            FILE_EXCEPTIONS.append(filename)
+
+
 def main():
 
     parser = argparse.ArgumentParser(description="Validate XML files against "
@@ -914,6 +927,9 @@ def main():
                         "manuals. The parameter can be passed multiple "
                         "times to add several directories.",
                         action="append")
+    parser.add_argument("--exceptions-file",
+                        help="File that contains filenames that will "
+                        "be skipped during validation.")
     parser.add_argument('--version',
                         action='version',
                         version=os_doc_tools.__version__)
@@ -928,6 +944,9 @@ def main():
         # No arguments given, use check-all
         prog_args.check_all = True
 
+    if prog_args.exceptions_file:
+        parse_exceptions(prog_args.exceptions_file, prog_args.verbose)
+
     if prog_args.check_all:
         prog_args.check_deletions = True
         prog_args.check_syntax = True
@@ -959,6 +978,7 @@ def main():
 
     if prog_args.check_build:
         build_affected_books(prog_args.path, BOOK_EXCEPTIONS,
+                             FILE_EXCEPTIONS,
                              prog_args.verbose, prog_args.force,
                              prog_args.ignore_errors,
                              prog_args.ignore_dir)