merge from upstream makefile