Changes requested by Debian packager drjunix on October 9th.