Apply 21_newlist_help.patch