Resync with upstream packaging