Fixes mail from Haakon and Debian patch from gregor herrmann