Bundles two changes suggested by Debian.