Imported Debian patch 2.3.3-1