Upstream version 5.07+dfsg