diff -up texlive-2007/texk/tetex/fmtutil.tmpcleanup texlive-2007/texk/tetex/fmtutil
--- texlive-2007/texk/tetex/fmtutil.tmpcleanup	2008-08-27 13:31:03.000000000 +0200
+++ texlive-2007/texk/tetex/fmtutil	2008-08-27 13:31:03.000000000 +0200
@@ -354,11 +354,13 @@ main()
   destdir=     # global variable: where do we put the format files?
   cnf_file=    # global variable: full name of the config file
   cmd=         # desired action from command line
-  needsCleanup=false
+  needsCleanup=true
   need_find_hyphenfile=false
   cfgparam=
   cfgmaint=
-  tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX`
+  tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX` || \
+      abort "could not create temporary directory"
+  trap -- "cleanup;" EXIT 1 2 3 7 13 15
   verboseFlag=true
 
   # mktexfmtMode: if called as mktexfmt, set to true. Will echo the
diff -up texlive-2007/texk/tetex/texconfig.tmpcleanup texlive-2007/texk/tetex/texconfig
--- texlive-2007/texk/tetex/texconfig.tmpcleanup	2008-08-27 13:31:03.000000000 +0200
+++ texlive-2007/texk/tetex/texconfig	2008-08-27 13:31:03.000000000 +0200
@@ -38,7 +38,8 @@ envVars="
   TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
 "
 tmpdir=`mktemp -d "${TMP-/tmp}/$progname.XXXXXX"` || exit 1
-needsCleanup=false
+trap -- "cleanup;" EXIT 1 2 3 7 13 15
+needsCleanup=true
 lastUpdatedFile=
 
 ###############################################################################
diff -up texlive-2007/texk/tetex/updmap.tmpcleanup texlive-2007/texk/tetex/updmap
--- texlive-2007/texk/tetex/updmap.tmpcleanup	2008-08-27 13:31:03.000000000 +0200
+++ texlive-2007/texk/tetex/updmap	2008-08-27 13:31:03.000000000 +0200
@@ -1291,7 +1291,7 @@ main()
   texhashEnabled=true
   mkmapEnabled=true
   verbose=true
-  needsCleanup=false
+  needsCleanup=true
 
   cnfFileShort=updmap.cfg
   cnfFile=
@@ -1299,7 +1299,8 @@ main()
   : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
 
   tmpdir=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX` || \
-       abort "could not create directory"
+       abort "could not create temporary directory"
+  trap -- "cleanup;" EXIT 1 2 3 7 13 15
   tmp1=$tmpdir/a
   tmp2=$tmpdir/b
   tmp3=$tmpdir/c