Makefile additions (modified)