diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index 1f459ed8e2..1e9fcbdaf7 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -326,16 +326,5 @@ SRCS+= mirrors.lastmod.inc \
mirrors.xml.cvsup.index.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 803649118d..843daf88a5 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -358,16 +358,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 8f09bff7a2..691f66350c 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -355,16 +355,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-SRCS+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index e301569eff..8663f22dc1 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -287,16 +287,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index dae85bf965..0d112fbd13 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -320,16 +320,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index 1d0287b18e..6bed57bf25 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -288,16 +288,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 25b9a8b818..2ad890a69b 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -361,15 +361,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index 2676cbbd6d..8f5a787732 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -358,16 +358,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index 46a034c392..fb101b3ce9 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -358,15 +358,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index f71bce96a9..65f970104e 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -256,15 +256,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 6ab253ac4d..db8c914aac 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -264,16 +264,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 1fc9c466c8..0b8ceb0e1e 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -454,7 +454,7 @@ GEN_INDEX_SGML_CMD?= @${ECHO} "Index is disabled or no index to generate."
.MAIN: all
-all: ${_docs}
+all: ${SRCS} ${_docs}
# put languages which have a problem on rendering printable formats
# by using TeX to NO_TEX_LANG.
@@ -668,7 +668,7 @@ ${DOC}.${_curformat}:
# having to convert it to any other formats
#
-lint validate:
+lint validate: ${SRCS}
${XMLLINT} --catalogs --nonet --noout --noent --valid ${MASTERDOC}
# ------------------------------------------------------------------------
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index 9029f3c43d..002ffb24f8 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -312,16 +312,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 0b8bb98633..86d6a538c6 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -300,16 +300,4 @@ SRCS+= mirrors.lastmod.inc \
eresources.xml.www.inc \
eresources.xml.www.index.inc
-CLEANFILES+= mirrors.lastmod.inc \
- mirrors.xml.ftp.inc \
- mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc \
- mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc \
- eresources.xml.www.index.inc
-
-lint: mirrors.lastmod.inc mirrors.xml.ftp.inc mirrors.xml.ftp.index.inc \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.index.inc \
- eresources.xml.www.inc eresources.xml.www.index.inc
-
.include "${DOC_PREFIX}/share/mk/doc.project.mk"