Imported Debian patch 0.2.1-1