diff -u -r ../fish-2.6.0/share/functions/__fish_print_help.fish ./share/functions/__fish_print_help.fish
--- ../fish-2.6.0/share/functions/__fish_print_help.fish	2017-06-03 14:45:13.000000000 +0200
+++ ./share/functions/__fish_print_help.fish	2017-06-05 21:29:51.794696261 +0200
@@ -45,7 +45,7 @@
         set mfish -mfish
     end
     if test -e "$__fish_datadir/man/man1/$item.1"
-        set help (nroff -c -man $mfish -t $rLL "$__fish_datadir/man/man1/$item.1" ^/dev/null)
+        set help (mandoc "$__fish_datadir/man/man1/$item.1" ^/dev/null)
     else if test -e "$__fish_datadir/man/man1/$item.1.gz"
         set help (gunzip -c "$__fish_datadir/man/man1/$item.1.gz" ^/dev/null | nroff -c -man $mfish -t $rLL ^/dev/null)
     end
@@ -103,6 +103,6 @@
                         # skip it
                 end
         end
-    end | ul # post-process with `ul`, to interpret the old-style grotty escapes
+    end
     echo # print a trailing blank line
 end