Synchronise with the upstream solution for X11 (consider that it's here)