Applying upstream fix to MakeFIle