diff --git a/ChangeLog b/ChangeLog
index 6feee3b..cb1824d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-06-22  Bruno Haible  <bruno@clisp.org>
+
+	Ensure that makeinfo ≥ 6.8 checks the @menu structure.
+	See
+	<https://lists.gnu.org/archive/html/bug-texinfo/2023-06/msg00015.html>.
+	* doc/Makefile.in (MAKEINFO): Add option
+	"-c CHECK_NORMAL_MENU_STRUCTURE=1".
+
 2022-09-08  Bruno Haible  <bruno@clisp.org>
 
 	Fix a warning regarding strncmp.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 699cbc4..d7bbdc9 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -48,7 +48,7 @@ TEX = tex
 TEXI2DVI = texi2dvi
 DVIPS = dvips -D600
 TEXI2PDF = texi2pdf
-MAKEINFO = LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo
+MAKEINFO = LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo -c CHECK_NORMAL_MENU_STRUCTURE=1
 TEXI2HTML = perl $(srcdir)/texi2html
 TEXI2ANY = texi2any