Imported Debian patch 2.1-2