Imported Debian patch 0.4-3