Took a superficial look at the manpage, and fixed whatever I spotted. Cherry picked from master, but required adjustments.