Changes for debian inclusion.