Update with changes from Christian Brueffer's man page delta (pull #3)