Upgrade Makefile