Note the ticket for pushing some of the changes to Makefile upstream