diff --git a/ChangeLog b/ChangeLog
index e6066380..0faeef44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for releng repo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jan 2013; Raúl Porcel <armin76@gentoo.org> tools/catalyst-auto:
+  Set to /tmp if $TMP_PATH isn't set
+
   11 Sep 2012; Raúl Porcel <armin76@gentoo.org>
   tools/catalyst-auto-sparc64.conf:
   Remove unneeded stuff
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 9e89d39b..c4c6aa6c 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -108,7 +108,7 @@ fi
 
 source ${config_file}
 
-TMPDIR=${TMP_PATH}/catalyst-auto.${PID}
+TMPDIR=${TMP_PATH:-/tmp}/catalyst-auto.${PID}
 DATESTAMP=$(date +%Y%m%d)
 
 if [ ${verbose} = 1 ]; then