Upstream version of the Makefile