sync to multiple machines?

So I have finally upgraded my iPhone. I used to sync media (audio & video) from another Mac that acts as a media center and address book, calendar etc from my laptop. Now after the update I'm being told that the media Mac wants to erase and sync my phone. Doesn't look like I can do split syncs any more. Boooo.