15_mansection8 and 35_man-spelling are now incorporated upstream.