Update for 3.18, change mk file reference in Makefile