makefile: merge with NEO v.13