diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile
index 5e44319015b..bc2cd1c18ba 100644
--- a/gnu/usr.bin/cc/doc/Makefile
+++ b/gnu/usr.bin/cc/doc/Makefile
@@ -2,18 +2,31 @@
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR}/cp ${GCCDIR}
+.PATH: ${GCCDIR}/doc
 
-INFO=	gcc cpp gxxint
+INFO=	gcc cpp gccint cppinternals
 
 INFOSECTION=    "Gcc Documentation"
-INFOENTRY_gcc=  "* gcc: (gcc).			The EGCS GNU C compiler."
-INFOENTRY_cpp=  "* cpp: (cpp).			The EGCS GNU C pre-processor."
-INFOENTRY_gxxint= "* gxxint: (gxxint).		The EGCS GNU compiler family internal documentation."
+INFOENTRY_gcc=  "* gcc: (gcc).			The GNU C compiler."
+INFOENTRY_cpp=  "* cpp: (cpp).			The GNU C pre-processor."
+INFOENTRY_gccint= "* gccint: (gccint).		The GNU compiler family internal documentation."
+INFOENTRY_cppinternals= "* cppinternals: (cppinternals).		The GNU compiler preprocessor internal documentation."
 
-gcc.info: gcc.texi invoke.texi install.texi extend.texi gcov.texi rtl.texi \
-	  md.texi tm.texi
+gcc.info: gcc.texi include/gcc-common.texi frontends.texi standards.texi \
+    invoke.texi extend.texi md.texi objc.texi gcov.texi trouble.texi \
+    bugreport.texi service.texi contribute.texi vms.texi \
+    include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
+    contrib.texi cppenv.texi cppopts.texi
 
-MAKEINFOFLAGS+= -I ${GCCDIR} -I ${GCCDIR}/cp
+gccint.info: gccint.texi include/gcc-common.texi contribute.texi \
+    makefile.texi configterms.texi portability.texi interface.texi \
+    passes.texi c-tree.texi rtl.texi md.texi tm.texi hostconfig.texi \
+    fragments.texi configfiles.texi collect2.texi headerdirs.texi \
+    include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
+    contrib.texi languages.texi sourcebuild.texi
+
+cpp.info: cpp.texi include/fdl.texi cppenv.texi cppopts.texi
+
+MAKEINFOFLAGS+= -I ${GCCDIR}/doc -I ${GCCDIR}/doc/include
 
 .include <bsd.info.mk>
diff --git a/gnu/usr.bin/cc/f77doc/Makefile b/gnu/usr.bin/cc/f77doc/Makefile
index d6e6384dbb4..1dd59de1397 100644
--- a/gnu/usr.bin/cc/f77doc/Makefile
+++ b/gnu/usr.bin/cc/f77doc/Makefile
@@ -6,8 +6,9 @@
 
 INFO= g77
 
-MAKEINFOFLAGS+= -I ${GCCDIR}/f
+MAKEINFOFLAGS+= -I ${GCCDIR}/f -I ${GCCDIR}/doc/include
 
-g77.info: g77.texi intdoc.texi
+g77.info: g77.texi intdoc.texi ffe.texi invoke.texi news.texi bugs.texi \
+    ../doc/include/gpl.texi ../doc/include/fdl.texi ../doc/include/funding.texi
 
 .include <bsd.info.mk>