Upstream version 2506+dfsg