adaptations for Ubuntu 11.10