diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 1815260c0338edbd529205073770df4c7789502a..16d9d9d10d1c641e7759309044fe1f402d643b7a 100755
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -9,14 +9,17 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 
 ################################################################################
 
+TMPFILE=$( mktemp -p ${TMPDIR} )
+
+function cleanup {
+    ERRVAL=$?
+    rm -f ${TMPFILE}
+    exit ${ERRVAL}
+}
+trap cleanup SIGHUP SIGINT SIGPIPE SIGTERM EXIT ERR
 
 # get the latest list of wnpp bugs and their source packages
-if $( wget -q -O/srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp http://qa.debian.org/data/bts/wnpp_rm ) ; then
-    mv /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
-else
-    if [ -f /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp ] ; then
-        rm /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp
-    fi
-fi
+wget -q -O${TMPFILE} http://qa.debian.org/data/bts/wnpp_rm
+mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
 
 ################################################################################