Upstream version 2.5j+dfsg