Update article.tpl and Makefile