And add the fix for opengl-xmlspec.