'make upgrade' needs updating

[walt]

I run mergemaster occasionally because it catches files that
make upgrade misses.  Today it misses about half a dozen or
so, including aliases, ftpusers, /usr/Makefile, and maybe a
few others I can't remember.

Thanks.