Latest changes for Debian.
More Debian changes.