Imported Debian patch 1.0.11~git-20060117-2