Fork to enable mailman support