Many companies, and also some distributions, have their own specific branches of GTK+.  The extent in which these branches differ from mainline GTK+ can range from a couple of bug fixes to implementations of several new features.  In this talk we will look at best practices in maintaining such vendor specific branches that usually have a non-trivial amount of changes. We will share our experience dealing with such branches, showing how to outline and digest the change set, making sure that you can easily track development in the mainline branch and preparing change sets for submission in mainline.  Although this talk will take branches of GTK+ as an example, the methods presented can be applied to other projects as well.