Imported Debian patch 5.1.5-7