Hi Chrysn, since nobody raised any veto and we finally will follow upstream anyway: Could you please push your changes to latest upstream version and than we try to work together from there? For instance it will help to contact upstream when refering to the latest upstream version.
Kind regards Andreas. -- http://fam-tille.de