I would also follow the instructions found here from scratch rather than try to fix a broken instillation by upgrading.