#4109:Updated Makefile & SPEC