Add CHANEGLOG entry; sort Makefile entries