Here's the patch me and Mateusz worked on during the EuroBSD dev summit
Created attachment 253692 [details] patch1
*** This bug has been marked as a duplicate of bug 281609 ***