Smaller X11 dependency. Also add to upgrade script.