diff -ur ../man-1.6g-orig/man2html/hman.1 ./man2html/hman.1
--- ../man-1.6g-orig/man2html/hman.1	2007-12-31 14:27:36.000000000 -0700
+++ ./man2html/hman.1	2012-05-11 17:19:30.614092335 -0700
@@ -33,13 +33,15 @@
 .SH OPTIONS
 .TP
 .B \-\^P " browser"
-Specify which browser (like lynx, xmosaic, arena, chimera,
-netscape, amaya, ...) to use. 
+Specify which browser (like lynx, elinks, firefox, or chromium-browser, ...)
+to use.
 This option overrides the
 .B MANHTMLPAGER
 environment variable.
-The default is the non-httpd version of
-.BR lynx .
+Otherwise,
+.B hman
+will use your system's default browser via
+.BR xdg-open (1) .
 .TP
 .B \-\^H " host"
 Specify from what host to get the man pages.
@@ -60,10 +62,3 @@
 .SH "SEE ALSO"
 .BR man (1),
 .BR man2html (1),
-.BR arena (1),
-.BR lynx (1),
-.BR netscape (1),
-.BR xmosaic (1),
-.BR glimpse (1)
-
-http://www.mcom.com/newsref/std/x-remote.html
diff -ur ../man-1.6g-orig/man2html/man2html.1 ./man2html/man2html.1
--- ../man-1.6g-orig/man2html/man2html.1	2007-12-31 14:27:36.000000000 -0700
+++ ./man2html/man2html.1	2012-05-11 17:13:59.360876849 -0700
@@ -39,7 +39,7 @@
 .LP
 .TS
 l l.
-foo(3x)	"http://localhost/cgi-bin/man/man2html?3x+foo"
+foo(3x)	"http://localhost/man/man2html?3x+foo"
 method://string	"method://string"
 www.host.name	"http://www.host.name"
 ftp.host.name	"ftp://ftp.host.name"
@@ -87,7 +87,7 @@
 .TP
 .B \-\^l
 Set method:cgipath to
-.RI lynxcgi: /home/httpd .
+.RI lynxcgi: /usr/lib/man2html .
 .TP
 .BI \-\^L " dir"
 Set method:cgipath to
@@ -95,7 +95,7 @@
 .TP
 .BI \-\^M " man2htmlpath"
 Set the man2htmlpath to use. The default is
-.IR /cgi-bin/man/man2html .
+.IR /man/man2html .
 .TP
 .B \-\^p
 Set separator to '/'.
@@ -114,7 +114,7 @@
 When some http daemon is running, lynx, or any other browser,
 can be used to browse the man pages, using the http method.
 The option \-l (for `lynxcgi') selects the former behaviour.
-With it, the default cgipath is \fI/home/httpd\fP.
+With it, the default cgipath is \fI/usr/lib/man2html\fP.
 
 In general, a cgi script can be called by
 .IP
@@ -137,8 +137,8 @@
 
 .SH BUGS
 There are many heuristics.  The output will not always be perfect.
-The lynxcgi method will not work if lynx was compiled without
-selecting support for it.  There may be problems with security.
+The lynxcgi method will not work if lynx is not configured for it.
+There may be problems with security.
 
 .SH AUTHOR
 Richard Verhoeven was the original author of