I think it's best to rebase the whole file based on the current dist/Makefile...