I didn't touch any of that, only the usual git checkout, gmake oldconfig and such dance.