there are two bugs in the Debian BTS that should probably be upstreamed here. I'm bundling them together because they are related, but it's true they are two distinct issues.

I bundle them because they somewhat depend on each other. Could you review those patches and see if they are appropriate?

They at least look good to me and I'm considering inclusion in the next upload...

Let me know! -- ?anarcat, your faithful debian packager...