Originally Posted by Crafty
^ yep and OTA provided you haven't rooted.
If you have an unbranded phone you'll get the update as soon as Samsung release it.
If your phone is branded you'll have to wait for your carrier to release the firmware, which will likely be some time after Samsung release it.
I have the international version and it's open-line. So I guess mine is classified as unbranded.