Updating for Ubuntu packaging.