Imported Debian patch 0.6-1