I'm hoping they'll do one of those "All new macs will get a free upgrade" from WWDC 07 onwards.

I was intending to buy after WWDC, but I'll have to re check now.