Imported Debian patch 1.2-2