wip/wicd/patches
