Imported Debian patch 1.0.7-5