A particularly pedantic set of changes currently used in Debian Authored-By: Ruben Undheim <ruben.undheim@gmail.com>
