New way to make package, copied from a later commit