wip/nnrpd/patches
