sync spec with upstream, add fireball subpackages