diff --git a/debian/changelog b/debian/changelog
index a664016..a77eb73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,9 +18,10 @@ ubuntu-dev-tools (0.137) UNRELEASED; urgency=low
   * mk-sbuild, pbuilder-dist, ubuntu-build: Add armhf.
   * pull-debian-source, pull-lp-source: Resolve the source package (via DDE),
     if a binary package was requested (LP: #617349)
-  * submittodebian: Do the report boiler-plate checking in a script that wraps
-    an editor, so that we only edit the report once, after checking for
-    duplicates.
+  * submittodebian:
+    - Do the report boiler-plate checking in a script that wraps an editor, so
+      that we only edit the report once, after checking for duplicates.
+    - rm the tmpdir with a little more force (shutil.rmtree) (LP: #899399)
 
   [ Andreas Moog ]
   * sponsor-patch: Check permission to unsubscribe sponsors-team (LP: #896884)
diff --git a/submittodebian b/submittodebian
index de82603..48122a7 100755
--- a/submittodebian
+++ b/submittodebian
@@ -24,6 +24,7 @@
 
 import os
 import re
+import shutil
 import sys
 from tempfile import mkdtemp
 
@@ -210,7 +211,7 @@ def main():
     submit_bugreport(body, debdiff, deb_version, changelog)
     os.unlink(body)
     os.unlink(debdiff)
-    os.rmdir(tmpdir)
+    shutil.rmtree(tmpdir)
 
 if __name__ == '__main__':
     main()