commit from Makefile 20131204.1004