Sync with freedesktop