diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index 0558ef3c65a3..8ea029bad638 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.files.mk,v 1.36 2004/05/13 13:05:53 lukem Exp $
+#	$NetBSD: bsd.files.mk,v 1.37 2004/05/17 12:58:17 lukem Exp $
 
 .if !defined(_BSD_FILES_MK_)
 _BSD_FILES_MK_=1
@@ -121,13 +121,13 @@ cleanbuildsymlinks: .PHONY
 
 .uue:
 	${_MKTARGET_CREATE}
-	rm -f ${.TARGET}
-	${TOOL_UUDECODE} ${UUDECODE_FILES_RENAME_${.TARGET}:?-p:} ${.IMPSRC} ${UUDECODE_FILES_RENAME_${.TARGET}:?>:} ${UUDECODE_FILES_RENAME_${.TARGET}:U}
-	${UUDECODE_FILES_RENAME_${.TARGET}:?touch ${.TARGET}:@true}
+	rm -f ${.TARGET} ${.TARGET}.tmp
+	${TOOL_UUDECODE} -p ${.IMPSRC} > ${.TARGET}.tmp \
+	    && mv ${.TARGET}.tmp ${UUDECODE_FILES_RENAME_${.TARGET}:U${.TARGET}}
 
 realall: ${UUDECODE_FILES}
 
-CLEANUUDECODE_FILES=${UUDECODE_FILES}
+CLEANUUDECODE_FILES=${UUDECODE_FILES} ${UUDECODE_FILES:=.tmp}
 .for i in ${UUDECODE_FILES}
 CLEANUUDECODE_FILES+=${UUDECODE_FILES_RENAME_${i}}
 .endfor