I submitted these mainline some months ago, but had to resubmit...
Since then I wanted to re-visit and re-submit.

I copied away the patches locally, thanks for doing this, it's more than time, that the package works again.