Imported Debian patch 0.2-3