Update for Ubuntu 13.10 after feedback from Eran Ifrah.