update ChangeLog
update Makefile