Improve this so it works on Ubuntu 14.04.