rebased rules.mk patch