unify packaging with upstream