Updated spec and makefile