Imported Debian patch 0.26-3