Imported Debian patch 0.8-1