Upstream version 8.07+dfsg