Grabbed the new makefile from upstream