diff --git a/livesupport/modules/storageAdmin/bin/backup.sh b/livesupport/modules/storageAdmin/bin/backup.sh
index e5f882b04..ea2167b55 100755
--- a/livesupport/modules/storageAdmin/bin/backup.sh
+++ b/livesupport/modules/storageAdmin/bin/backup.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: tomas $
-#   Version  : $Revision: 1.1 $
+#   Version  : $Revision: 1.2 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/bin/backup.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -92,7 +92,7 @@ destdir=`cd $destdir; pwd`
 #   Do backup
 #-------------------------------------------------------------------------------
 
-tmpdir=`mktemp -dp $tmpmaindir`
+tmpdir=`mktemp -d $tmpmaindir/tmp.XXXXXX`
 
 echo "Backuping to $destdir/$tarfile :"
 echo "Dumping database  ..."
@@ -110,7 +110,7 @@ echo "Compressing XML part ..."
 bzip2 $tarfile0
 tar rf $tarfile $tarfile0.bz2 --remove-files
 mv $tarfile "$destdir"
-rm -rf $tmpdir
+rmdir $tmpdir
 
 #-------------------------------------------------------------------------------
 #   Say goodbye
diff --git a/livesupport/modules/storageAdmin/bin/restore.sh b/livesupport/modules/storageAdmin/bin/restore.sh
index 0d91c32e3..33ec3ac17 100755
--- a/livesupport/modules/storageAdmin/bin/restore.sh
+++ b/livesupport/modules/storageAdmin/bin/restore.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: tomas $
-#   Version  : $Revision: 1.1 $
+#   Version  : $Revision: 1.2 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/bin/restore.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -98,7 +98,7 @@ tarfile="$tfdir/$tfbname"
 #   Do restore
 #-------------------------------------------------------------------------------
 
-tmpdir=`mktemp -dp $tmpmaindir`
+tmpdir=`mktemp -d $tmpmaindir/tmp.XXXXXX`
 
 echo "Restoring database from $tarfile ..."
 cd $tmpdir
@@ -107,7 +107,10 @@ tar xjf $tarfile0.bz2
 rm -f $tarfile0.bz2
 cd $phpdir
 php -q restore.php $tmpdir/$dbxml $tmpdir
-rm -rf $tmpdir
+rm -rf "$tmpdir/stor"
+rm -f $tmpdir/*
+rmdir "$tmpdir"
+
 
 #-------------------------------------------------------------------------------
 #   Say goodbye