And get rid of the $pkgbase