Imported Debian patch 1.01b-7