Update makefile and spec