Commit makefile changes for real