Use upstream configuration settings where possible and replace downstream patches with upstream fixes. Rename downstream patches to start with 0100