The following patch from kitcreator should (maybe?) be applied.  It will need some massaging:


I'm not confident to apply it without a test case, as it's fairly hefty and doesn't apply cleanly against trunk.

All the other patches shipped with kitcreator already appear to be present (the latest in [d20b473929], everything else from CVS).