Merge in fix for makefiles.