diff --git a/ChangeLog b/ChangeLog
index 185d902d7..931717f64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-02-22  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	* Makefile.am (uninstall_groffdirs): Remove "html.mono" and
+	"html.node" directories corresponding to HTML version of our
+	Texinfo manual.
+	* doc/doc.am (uninstall-html): Uninstall HTML version of our
+	Texinfo manual more reliably.
+
 2023-02-22  G. Branden Robinson <g.branden.robinson@gmail.com>
 
 	[doc]: Handle output formats of our Texinfo manual more
diff --git a/Makefile.am b/Makefile.am
index 0a37778cc..a5d8907f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -774,6 +774,12 @@ uninstall_groffdirs:
 	    rmdir $(DESTDIR)$(exampledir); \
 	  fi; \
 	  if test -d $(DESTDIR)$(htmldocdir); then \
+	    if test -d $(DESTDIR)$(htmldocdir)/groff.html.mono; then \
+	      rmdir $(DESTDIR)$(htmldocdir)/groff.html.mono; \
+	    fi; \
+	    if test -d $(DESTDIR)$(htmldocdir)/groff.html.node; then \
+	      rmdir $(DESTDIR)$(htmldocdir)/groff.html.node; \
+	    fi; \
 	    rmdir $(DESTDIR)$(htmldocdir); \
 	  fi; \
 	  rmdir $(DESTDIR)$(docdir); \
diff --git a/doc/doc.am b/doc/doc.am
index e7733d147..cddc51907 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -665,7 +665,8 @@ uninstall-pdf:
 	$(RM) $(DESTDIR)$(pdfdocdir)/groff.pdf
 	-rmdir $(DESTDIR)$(pdfdocdir)
 uninstall-html:
-	$(RM) $(DESTDIR)$(htmldocdir)/groff.html.*
+	$(RM) $(DESTDIR)$(htmldocdir)/groff.html.mono/*
+	$(RM) $(DESTDIR)$(htmldocdir)/groff.html.node/*
 uninstall-txt:
 	$(RM) $(DESTDIR)$(docdir)/groff.txt