Hello "make update" in upstream Gambit drops patches on the local branch; it doesn't merge. Since updating has to be done in steps, this poses a problem if one has local changes. This patch series solves this. I've tested it for some time now and it works without problems for me. Christian.