diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile b/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile
index 5c5768f68f..52bbf5702d 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile
@@ -80,7 +80,9 @@ D+=		relnotes
 
 MAN4PAGES?=	${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
 ARCHLIST?=	${.CURDIR}/../../share/misc/dev.archlist.txt
-CLEANFILES+=	dev-auto.ent
+CLEANFILES+=	dev-auto.ent \
+		index.html \
+		schedule.html
 
 MAN2HWNOTES_CMD=${.CURDIR}/../../share/misc/man2hwnotes.pl
 .if defined(HWNOTES_MI)
@@ -90,14 +92,14 @@ MAN2HWNOTES_FLAGS=	-c
 .endif
 
 dev-auto.ent:
-	${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES}
-
-beforebuild:	dev-auto.ent
+	${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET}.tmp ${MAN4PAGES}
+	${MV} ${.TARGET}.tmp ${.TARGET}
 
+.if make(clean)
 beforeclean:
-.for _SD in ${D}
-	${MAKE} -C ${_SD} DOCINSTALLDIR=${DOCINSTALLDIR} clean
-.endfor
+SUBDIR+=	${D}
+.include "${DOC_PREFIX}/share/mk/doc.subdir.mk"
+.endif
 
 beforeinstall:
 .for _SD in ${D}
diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile b/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile
index 37b8144030..c5290b805d 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile
@@ -21,7 +21,6 @@ SRCS?=			errata.xml
 
 DATA+=			${DOC}.html
 
-beforeclean:
 CLEANFILES+=		${DOC}.html \
 			${DOC}.txt \
 			catalog-cwd.xml \
diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile b/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
index bfaeab5665..74e1bf90bb 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
@@ -21,7 +21,6 @@ SRCS?=			hardware.xml
 
 DATA+=			${DOC}.html
 
-beforeclean:
 CLEANFILES+=		${DOC}.html \
 			${DOC}.txt \
 			catalog-cwd.xml \
diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/readme/Makefile b/en_US.ISO8859-1/htdocs/releases/12.0R/readme/Makefile
index 3296148140..f710e6e7b3 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/readme/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/readme/Makefile
@@ -21,7 +21,6 @@ SRCS?=			readme.xml
 
 DATA+=			${DOC}.html
 
-beforeclean:
 CLEANFILES+=		${DOC}.html \
 			${DOC}.txt \
 			catalog-cwd.xml \
diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile b/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile
index 4f2942ecd5..8f4691ef76 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/Makefile
@@ -21,7 +21,6 @@ SRCS?=			relnotes.xml
 
 DATA+=			${DOC}.html
 
-beforeclean:
 CLEANFILES+=		${DOC}.html \
 			${DOC}.txt \
 			catalog-cwd.xml \