diff --git a/src/scripts/elua/apps/docgen/writer.lua b/src/scripts/elua/apps/docgen/writer.lua
index aa29426096..91d683e0b4 100644
--- a/src/scripts/elua/apps/docgen/writer.lua
+++ b/src/scripts/elua/apps/docgen/writer.lua
@@ -58,8 +58,12 @@ M.Writer = util.Object:clone {
         dutil.mkdir_p(subs)
         self.file = assert(io.open(dutil.make_page(subs), "w"))
         if title then
-            self:write_raw("<title>", title, "</title>")
-            self:write_nl()
+            if M.has_feature("title") then
+                self:write_raw("<title>", title, "</title>")
+                self:write_nl()
+            else
+                self:write_h(title, 1)
+            end
         end
     end,
 
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index a50d3bb077..cf50b861d5 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -1058,7 +1058,8 @@ getopt.parse {
         { nil, "graph-theme-light", false, help = "Use light builtin graph theme." },
         { nil, "disable-graphviz", false, help = "Disable graphviz usage." },
         { nil, "disable-notes", false, help = "Disable notes plugin usage." },
-        { nil, "disable-folded", false, help = "Disable folded plugin usage." }
+        { nil, "disable-folded", false, help = "Disable folded plugin usage." },
+        { nil, "disable-title", false, help = "Disable title plugin usage." }
     },
     error_cb = function(parser, msg)
         io.stderr:write(msg, "\n")
@@ -1096,7 +1097,8 @@ getopt.parse {
         local wfeatures = {
             notes = not opts["disable-notes"],
             folds = not opts["disable-folded"],
-            dot = not opts["disable-graphviz"]
+            dot = not opts["disable-graphviz"],
+            title = not opts["disable-title"]
         }
         writer.init(rootns, wfeatures)
         dutil.rm_root()