You need:
 - the new client (see post by TheMightyX earlier)
 - delete your current blockchain.

Save your wallet before you delete the blockchain.

Once I did that, it all updated fine for me.