new .mk created for upstream changes