Finalize changes for 2.3+dfsg-1