diff --git a/auditbeat/docs/modules_list.asciidoc b/auditbeat/docs/modules_list.asciidoc
index 184457a796b9..ed367bac1d09 100644
--- a/auditbeat/docs/modules_list.asciidoc
+++ b/auditbeat/docs/modules_list.asciidoc
@@ -4,9 +4,11 @@ This file is generated! See scripts/docs_collector.py
 
   * <<{beatname_lc}-module-auditd,Auditd>>
   * <<{beatname_lc}-module-file_integrity,File Integrity>>
+  * <<{beatname_lc}-module-system,System>>
 
 
 --
 
 include::./modules/auditd.asciidoc[]
 include::./modules/file_integrity.asciidoc[]
+include::../../x-pack/auditbeat/docs/modules/system.asciidoc[]
diff --git a/auditbeat/scripts/docs_collector.py b/auditbeat/scripts/docs_collector.py
index d1654978a0f0..87e1d3104aa2 100644
--- a/auditbeat/scripts/docs_collector.py
+++ b/auditbeat/scripts/docs_collector.py
@@ -153,20 +153,10 @@ def collect(base_paths):
 
     module_list_output = generated_note
     for m, title in sorted(six.iteritems(modules_list)):
-        if m == "system":
-            # This is a very crude way of excluding references to X-Pack docs from
-            # the build until the docs build is updated with the new folder.
-            # TODO: Remove at the earliest possible time.
-            continue
         module_list_output += "  * <<{beatname_lc}-module-" + m + "," + title + ">>\n"
 
     module_list_output += "\n\n--\n\n"
     for module_name, module_path in sorted(six.iteritems(module_dirs)):
-        if module_name == "system":
-            # This is a very crude way of excluding references to X-Pack docs from
-            # the build until the docs build is updated with the new folder.
-            # TODO: Remove at the earliest possible time.
-            continue
         rel_path_to_module_docs = os.path.relpath(module_docs_path(module_path), docs_path)
         module_list_output += "include::" + \
             os.path.join(rel_path_to_module_docs, "modules", module_name + ".asciidoc") + "[]\n"