Minor changes from Adrian Glaubitz before upload to debian