After some consultation on IRC, the attached patch (to be applied against 2.0.11) fixes bugs #291666, #291668 and #291665, and some other issues that came up while we were chatting.
The manpages need some beautification, I am a nroff idiot. Greetings Marc
dpatch_2.0.11_2.0.11.0.interdiff.gz
Description: Binary data
