Follow-up on the unmerged !4 (closed).
See http://bugs.debian.org/500611 and safe-temporary-files.patch.