Imported Debian patch 2.3.8-4