sync with kumquat.mk