See attached man page patch, incorporating input from Ori.