diff between package and upstream

Hi Johannes,
this is the series of commits that I have in my tree to arrive at the packaged state.
Enjoy!
--Toni++