diff --git a/debian/changelog b/debian/changelog
index b449eaaa8..f0f26e29b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ linux-2.6 (3.2.6-1) UNRELEASED; urgency=low
   * Change linux-image dependencies to allow kmod as an alternative to
     module-init-tools
   * relay: prevent integer overflow in relay_open()
+  * builddeb: Don't create files in /tmp with predictable names
 
  -- Bastian Blank <waldi@debian.org>  Mon, 06 Feb 2012 11:22:07 +0100
 
diff --git a/debian/patches/bugfix/all/builddeb-Don-t-create-files-in-tmp-with-predictable-.patch b/debian/patches/bugfix/all/builddeb-Don-t-create-files-in-tmp-with-predictable-.patch
new file mode 100644
index 000000000..9f202bd1d
--- /dev/null
+++ b/debian/patches/bugfix/all/builddeb-Don-t-create-files-in-tmp-with-predictable-.patch
@@ -0,0 +1,41 @@
+From b27be705aaeb527613e1b7ee2964c52453ebc337 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 14 Feb 2012 02:19:04 +0000
+Subject: [PATCH] builddeb: Don't create files in /tmp with predictable names
+
+The current use of /tmp is insecure.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: stable@vger.kernel.org
+---
+ scripts/package/builddeb |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index f6cbc3d..3c6c0b1 100644
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -238,14 +238,14 @@ EOF
+ fi
+ 
+ # Build header package
+-(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)
+-(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)
+-(cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
++(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
++(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
++(cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+ destdir=$kernel_headers_dir/usr/src/linux-headers-$version
+ mkdir -p "$destdir"
+-(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
+-(cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
+-rm -f /tmp/files$$ /tmp/objfiles$$
++(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
++(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
++rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+ arch=$(dpkg --print-architecture)
+ 
+ cat <<EOF >> debian/control
+-- 
+1.7.9
+
diff --git a/debian/patches/series/base b/debian/patches/series/base
index 276580f54..b55c7c4ac 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -78,3 +78,4 @@
 + bugfix/arm/ARM-ixp4xx-mtd-oops.patch
 
 + bugfix/all/relay-prevent-integer-overflow-in-relay_open.patch
++ bugfix/all/builddeb-Don-t-create-files-in-tmp-with-predictable-.patch