Imported Debian patch 1.0.8-5