Imported Debian patch 1.0.9-8