For code owned by me (Alan Cox) please keep the original license and do not change it, as I wish my code to be usable by forks of the XFree86 codebase that allow GPL drivers (like AlanH's VNC driver and the new touchpad drivers) as well as linking with GPL code. Thanks Alan