Updated package Makefiles to new version