Upstream version 2.67+dfsg