diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp
index f9601f8281..d917bc73fc 100644
--- a/src/tools/qdoc/generator.cpp
+++ b/src/tools/qdoc/generator.cpp
@@ -945,6 +945,8 @@ void Generator::generateInnerNode(InnerNode* node)
 {
     if (!node->url().isNull())
         return;
+    if (node->isIndexNode())
+        return;
 
     if (node->type() == Node::Document) {
         DocNode* docNode = static_cast<DocNode*>(node);
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp
index 9e67007eba..bfa2524a6c 100644
--- a/src/tools/qdoc/helpprojectwriter.cpp
+++ b/src/tools/qdoc/helpprojectwriter.cpp
@@ -422,6 +422,11 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
 void HelpProjectWriter::generateSections(HelpProject &project,
                                          QXmlStreamWriter &writer, const Node *node)
 {
+    /*
+      Don't include index nodes in the help file. Or DITA map nodes.
+     */
+    if (node->isIndexNode() || node->subType() == Node::DitaMap)
+        return;
     if (!generateSection(project, writer, node))
         return;