diff --git a/include/Make/HtmlRules.make b/include/Make/HtmlRules.make
index ed9f65501bd..0c79a05a2ad 100644
--- a/include/Make/HtmlRules.make
+++ b/include/Make/HtmlRules.make
@@ -1,7 +1,7 @@
 
 # common html rules (included by Html.make and GuiScript.make)
 
-htmldesc = $(call run_grass,$(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(2))
+htmldesc = $(call run_grass,$(1) --html-description < /dev/null | grep -v '</body>\|</html>\|</div> <!-- end container -->' > $(2))
 
 IMGSRC := $(wildcard *.png) $(wildcard *.jpg) $(wildcard *.gif)
 IMGDST := $(patsubst %,$(HTMLDIR)/%,$(IMGSRC))
diff --git a/lib/gis/parser_html.c b/lib/gis/parser_html.c
index 7ee8b14a567..304edeea4df 100644
--- a/lib/gis/parser_html.c
+++ b/lib/gis/parser_html.c
@@ -295,6 +295,7 @@ void G__usage_html(void)
     }
     fprintf(stdout, "</div>\n");
 
+    fprintf(stdout, "</div> <!-- end container -->\n");
     fprintf(stdout, "</body>\n</html>\n");
 }
 
diff --git a/utils/mkhtml.py b/utils/mkhtml.py
index 47021cbb8cc..6056a747364 100644
--- a/utils/mkhtml.py
+++ b/utils/mkhtml.py
@@ -687,7 +687,10 @@ def get_addon_path():
         sys.stdout.write(header_tmpl.substitute(PGM=pgm, PGM_DESC=pgm_desc))
     if tmp_data:
         for line in tmp_data.splitlines(True):
-            if not re.search("</body>|</html>", line, re.IGNORECASE):
+            # The cleanup happens on Makefile level too.
+            if not re.search(
+                "</body>|</html>|</div> <!-- end container -->", line, re.IGNORECASE
+            ):
                 sys.stdout.write(line)
 
 # create TOC