Updated Makefile following yogafire (bug 1020500)