Some WIP pull request

(added to my lintian remarks by mail)