Upstream: /usr/man fixes