My changes to sudar's repository, mainly for Debian compatibility