diff --git a/en_US.ISO8859-1/htdocs/doc/Makefile b/en_US.ISO8859-1/htdocs/doc/Makefile
index 858e435655..33844f74da 100644
--- a/en_US.ISO8859-1/htdocs/doc/Makefile
+++ b/en_US.ISO8859-1/htdocs/doc/Makefile
@@ -1,48 +1,48 @@
 #
 # $FreeBSD$
 #
 # Build the FreeBSD documentation *outside* of the doc/ tree, and install it
 # in to the right place as necessary.
 #
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 _DOC_FORMATS?=	html-split html
 
 all: all-all 
 
 
 all-all:
 	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all
 
 all-pgpkeyring:
-	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt
+	${MAKE} -C ${DOC_PREFIX}/share/pgpkeys all
 
 clean:
 	${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean
 
 # here are dragons
 install:
 	unset DESTDIR || true; \
 	  ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install
 	${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt
 
 beforeinstall:
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
 .if ${LANGCODE} == en_US.ISO8859-1
 	${MAKE} -C ${.CURDIR} all-pgpkeyring
 .endif
 
 
 # XXX
 obj: _OBJUSE
 
 _OBJUSE: .USE
 	@unset DESTDIR || true; \
 	 cd ${DOC_PREFIX}/${LANGCODE}; \
 		${MAKE} ${.TARGET}
diff --git a/share/pgpkeys/Makefile b/share/pgpkeys/Makefile
index f72c876d3b..fbd9f82d74 100644
--- a/share/pgpkeys/Makefile
+++ b/share/pgpkeys/Makefile
@@ -1,29 +1,33 @@
 # $FreeBSD$
 
 DOC_PREFIX?=	${.CURDIR}/../..
 
 XSLPGP=		http://www.FreeBSD.org/XML/share/xml/freebsd-pgpkeyring.xsl
 
 FILES=		pgpkeyring.txt
 CLEANFILES=	pgpkeyring.txt keyring.xml
 
+.ORDER:	pgpkeyring pgpkeyring.txt
+.ORDER:	keyring.xml pgpkeyring.txt
+
 all:	keyring.xml pgpkeyring pgpkeyring.txt
 
 keyring.xml:	.PHONY
 	@${ECHO_CMD} "<?xml version='1.0' encoding='UTF-8'?>" > ${.TARGET}
 	@${ECHO_CMD} "<keyring>" >> ${.TARGET}
 	@${CAT} *.key >> ${.TARGET}
 	@${ECHO_CMD} "</keyring>" >> ${.TARGET}
 
 pgpkeyring: keyring.xml
 	@${XSLTPROC} ${XSLTPROCOPTS} ${XSLPGP} keyring.xml
 
 pgpkeyring.txt:
-	@${MAKE} pgpkeyring > ${.TARGET}.tmp
+	@${RM} -f ${.TARGET}.tmp || true
+	@${MAKE} -C ${.CURDIR} pgpkeyring > ${.TARGET}.tmp
 	${MV} ${.TARGET}.tmp ${.TARGET}
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .if defined(FINGERPRINTS_ONLY)
 XSLTPROCOPTS+=--param generate.fingerprint.only '1'
 .endif