I did a tentative packaging upstream version 2.2.1 for my own use, based of course on the packaging in the collab-maint git repo.
I've taken the liberty of pushing the new upstream tarballs into that repo on the upstream & pristine-tar branches, with matching upstream/* tags. I also pushed the packaging updates I did onto a new branch, barak-master, for your consideration. Hope that's okay, if not please back them out and yell at me! Cheers, --Barak.