diff --git a/ChangeLog b/ChangeLog
index bdf89b3db..14e7994b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-29  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	* bench/gspn-ssp/tools/defs.in (TMPDIR): New variable.
+	* bench/gspn-ssp/tools/runbench: Use it.
+
 2008-08-29  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	* bench/gspn-ssp/tools/sum: Fix the order of stats in -e4.
diff --git a/bench/gspn-ssp/defs.in b/bench/gspn-ssp/defs.in
index e659c058e..0f9408ff7 100644
--- a/bench/gspn-ssp/defs.in
+++ b/bench/gspn-ssp/defs.in
@@ -40,4 +40,5 @@ LTLGSPNSRG='@abs_top_builddir@/iface/gspn/ltlgspn-srg'
 SNOW=/home/adl/projs/src/gspn/snow
 TRANS2PL='@abs_srcdir@/tools/trans2prop.pl'
 TIME='/usr/bin/time -p'
-export RANDLTL LTLGSPNSSP LTLGSPNSRG TIME SNOW TRANS2PL
+TMPDIR=${TMPDIR-/tmp}
+export RANDLTL LTLGSPNSSP LTLGSPNSRG TIME SNOW TRANS2PL TMPDIR
diff --git a/bench/gspn-ssp/tools/runbench b/bench/gspn-ssp/tools/runbench
index d45e4dc2d..6a87c2531 100755
--- a/bench/gspn-ssp/tools/runbench
+++ b/bench/gspn-ssp/tools/runbench
@@ -4,10 +4,12 @@ formula=`sed -n "$2{p;q}" $1`
 check=$3
 model=$4
 
-. ./defs
+. ./defs || exit 1
 
-cp -r models/$model tmp-$$
-cd tmp-$$
+cp -r models/$model $TMPDIR/tmp-$$ || exit 1
+cd $TMPDIR/tmp-$$ || exit 1
+
+(
 case $model in
     *.rg)
       if [ ! -f $model.snow ]; then
@@ -27,6 +29,6 @@ esac
 test -f $model.mark || touch $model.mark
 test -f $model.event || touch $model.event
 du -b *.mark *.event | cut -f 1
+)
 
-cd ..
-rm -rf tmp-$$
+rm -rf $TMPDIR/tmp-$$