Update for Ubuntu 11.10