diff --git a/debian/changelog b/debian/changelog
index ada19f9..fe7f84d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ubuntu-dev-tools (0.136) UNRELEASED; urgency=low
   * grab-merge: Use wget -nv rather than -q, so that we see error messages
     (LP: #881967)
   * requestsync: Make --lp the default.
+  * submittodebian: Use prettier patch filenames (LP: #887333)
 
  -- Stefano Rivera <stefanor@debian.org>  Sat, 12 Nov 2011 23:28:05 +0200
 
diff --git a/submittodebian b/submittodebian
index f697543..f83f1b6 100755
--- a/submittodebian
+++ b/submittodebian
@@ -25,7 +25,7 @@
 import os
 import re
 import sys
-from tempfile import mkstemp
+from tempfile import mkdtemp
 
 from distro_info import UbuntuDistroInfo
 
@@ -67,15 +67,14 @@ Thanks for considering the patch.
 """ % ("\n".join([a for a in entry.changes()]))
     return msg
 
-def gen_debdiff(changelog):
+def gen_debdiff(tmpdir, changelog):
     pkg = changelog.package
 
     changelog_it = iter(changelog)
     newver = next(changelog_it).version
     oldver = next(changelog_it).version
 
-    (fd, debdiff) = mkstemp()
-    os.close(fd)
+    debdiff = os.path.join(tmpdir, '%s_%s.debdiff' % (pkg, newver))
 
     if os.system('bzr diff -r tag:%s > /dev/null 2>&1' % oldver) == 256:
         print "Extracting bzr diff between %s and %s" % (oldver, newver)
@@ -176,16 +175,18 @@ def main():
     deb_version = get_most_recent_debian_version(changelog)
     bug_body = get_bug_body(changelog)
 
-    fd, body = mkstemp()
-    fp = os.fdopen(fd, 'w')
+    tmpdir = mkdtemp()
+    body = os.path.join(tmpdir, 'bug_body')
+    fp = open(body, 'w')
     fp.write(bug_body)
     fp.close()
 
-    debdiff = gen_debdiff(changelog)
+    debdiff = gen_debdiff(tmpdir, changelog)
     edit_debdiff(debdiff)
     submit_bugreport(body, debdiff, deb_version, changelog)
     os.unlink(body)
     os.unlink(debdiff)
+    os.rmdir(tmpdir)
 
 if __name__ == '__main__':
     main()