Comment 5 for bug 578014

Thanks, those patches apply cleanly for me. I've separated out the two issues at forwarded to debian as upstream seems dead. I'll open another bug to track the second issue separately.