diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index fc885bcf0..6d47c903c 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-12  Ludovic Courtès  <ludo@gnu.org>
+
+	* guile-snarf.in (tempdir): Honor `$TMPDIR'.
+
 2008-02-11  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* numbers.c (SCM_COMPLEX_VALUE): Use GUILE_I instead of _Complex_I
diff --git a/libguile/guile-snarf.in b/libguile/guile-snarf.in
index 89ef79092..617bad822 100644
--- a/libguile/guile-snarf.in
+++ b/libguile/guile-snarf.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Extract the initialization actions from source files.
 #
-#  Copyright (C) 1996, 97, 98, 99, 2000, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+#  Copyright (C) 1996, 97, 98, 99, 2000, 2001, 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,9 +69,12 @@ fi
 
 # set vars and handler -- handle CPP override
 cpp_ok_p=false
-tempdir="/tmp/snarf.$$"
+
+if [ x"$TMPDIR" = x ]; then TMPDIR="/tmp" ; else : ; fi
+tempdir="$TMPDIR/guile-snarf.$$"
 (umask 077 && mkdir $tempdir) || exit 1
 temp="$tempdir/tmp"
+
 if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
 
 trap "rm -rf $tempdir" 0 1 2 15