XQuartz has an update for X11 on Mac. Remember to re-install this package after further updates to Mac OS X.

UPDATE: it’s been updated to 2.2.0.1 already.