diff --git a/Makefile b/Makefile
index 9a23c640716d..4f21a886ec30 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,9 @@ index:
 	@cd ${.CURDIR} && ${MAKE} ${INDEXDIR}/${INDEXFILE}
 
 fetchindex: ${INDEXDIR}/${INDEXFILE}.bz2
-	@bunzip2 < ${INDEXDIR}/${INDEXFILE}.bz2 > ${INDEXDIR}/${INDEXFILE} && \
-	chmod a+r ${INDEXDIR}/${INDEXFILE} && ${RM} ${INDEXDIR}/${INDEXFILE}.bz2
+	@rm -f ${INDEXDIR}/${INDEXFILE}
+	@bzip2 -k -d ${INDEXDIR}/${INDEXFILE}.bz2
+	@chmod a+r ${INDEXDIR}/${INDEXFILE}
 
 ${INDEXDIR}/${INDEXFILE}.bz2: .PHONY
 	@${FETCHINDEX} ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2