Imported Debian patch 0.2.4-8