Move common definition to Makefile.common and include it. It seems that official changes aren't available.