commit from Makefile 20131211.2246