Imported Debian patch 2.4.0-2