diff --git a/doc/h2load.1 b/doc/h2load.1
index 623fa633..6778e46b 100644
--- a/doc/h2load.1
+++ b/doc/h2load.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "February 29, 2016" "1.9.0-DEV" "nghttp2"
+.TH "H2LOAD" "1" "March 20, 2016" "1.9.0-DEV" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
diff --git a/doc/nghttp.1 b/doc/nghttp.1
index c825350a..f7bfdf52 100644
--- a/doc/nghttp.1
+++ b/doc/nghttp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "February 29, 2016" "1.9.0-DEV" "nghttp2"
+.TH "NGHTTP" "1" "March 20, 2016" "1.9.0-DEV" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 client
 .
diff --git a/doc/nghttpd.1 b/doc/nghttpd.1
index fbb76af3..f376225b 100644
--- a/doc/nghttpd.1
+++ b/doc/nghttpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "February 29, 2016" "1.9.0-DEV" "nghttp2"
+.TH "NGHTTPD" "1" "March 20, 2016" "1.9.0-DEV" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 server
 .
diff --git a/doc/nghttpx.1 b/doc/nghttpx.1
index c615bd69..6a2d676f 100644
--- a/doc/nghttpx.1
+++ b/doc/nghttpx.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "February 29, 2016" "1.9.0-DEV" "nghttp2"
+.TH "NGHTTPX" "1" "March 20, 2016" "1.9.0-DEV" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 proxy
 .
@@ -82,8 +82,14 @@ host   (e.g.,   specifying   "nghttp2.org"   equals   to
 .sp
 Patterns with  host take  precedence over  patterns with
 just path.   Then, longer patterns take  precedence over
-shorter  ones,  breaking  a  tie by  the  order  of  the
-appearance in the configuration.
+shorter ones.
+.sp
+Host  can  include "*"  in  the  left most  position  to
+indicate  wildcard match  (only suffix  match is  done).
+For  example,  host pattern  "*www.nghttp2.org"  matches
+against  "www.nghttp2.org"  and  "1www.ngttp2.org",  but
+does not  match against "nghttp2.org".  The  exact hosts
+match takes precedence over the wildcard hosts match.
 .sp
 If <PATTERN> is omitted or  empty string, "\fI/\fP" is used as
 pattern,  which  matches  all request  paths  (catch\-all
@@ -1024,6 +1030,16 @@ towards this number.
 .sp
 Default: \fB500\fP
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-error\-page=(<CODE>|*)=<PATH>
+Set file path  to custom error page  served when nghttpx
+originally  generates  HTTP  error status  code  <CODE>.
+<CODE> must be greater than or equal to 400, and at most
+599.  If "*"  is used instead of <CODE>,  it matches all
+HTTP  status  code.  If  error  status  code comes  from
+backend server, the custom error pages are not used.
+.UNINDENT
 .SS Debug
 .INDENT 0.0
 .TP
diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst
index afccc2e9..ebf26493 100644
--- a/doc/nghttpx.1.rst
+++ b/doc/nghttpx.1.rst
@@ -65,8 +65,14 @@ Connections
 
     Patterns with  host take  precedence over  patterns with
     just path.   Then, longer patterns take  precedence over
-    shorter  ones,  breaking  a  tie by  the  order  of  the
-    appearance in the configuration.
+    shorter ones.
+
+    Host  can  include "\*"  in  the  left most  position  to
+    indicate  wildcard match  (only suffix  match is  done).
+    For  example,  host pattern  "\*www.nghttp2.org"  matches
+    against  "www.nghttp2.org"  and  "1www.ngttp2.org",  but
+    does not  match against "nghttp2.org".  The  exact hosts
+    match takes precedence over the wildcard hosts match.
 
     If <PATTERN> is omitted or  empty string, "*/*" is used as
     pattern,  which  matches  all request  paths  (catch-all
@@ -913,6 +919,15 @@ HTTP
 
     Default: ``500``
 
+.. option:: --error-page=(<CODE>|*)=<PATH>
+
+    Set file path  to custom error page  served when nghttpx
+    originally  generates  HTTP  error status  code  <CODE>.
+    <CODE> must be greater than or equal to 400, and at most
+    599.  If "*"  is used instead of <CODE>,  it matches all
+    HTTP  status  code.  If  error  status  code comes  from
+    backend server, the custom error pages are not used.
+
 
 Debug
 ~~~~~