Finalize changes for 2.2.1+dfsg-1