diff --git a/doc/h2load.1 b/doc/h2load.1
index 04234013..4e639968 100644
--- a/doc/h2load.1
+++ b/doc/h2load.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "October 25, 2015" "1.4.0" "nghttp2"
+.TH "H2LOAD" "1" "November 12, 2015" "1.4.1-DEV" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
@@ -292,10 +292,14 @@ requests were made via TLS, this value is the number of decrypted
 bytes.
 .TP
 .B headers
-The number of response header bytes from the server without
-decompression.  For HTTP/2, this is the sum of the payload of
-HEADERS frame.  For SPDY, this is the sum of the payload of
-SYN_REPLY frame.
+The  number  of response  header  bytes  from the  server  without
+decompression.  The  \fBspace savings\fP shows efficiency  of header
+compression.  Let \fBdecompressed(headers)\fP to the number of bytes
+used for header fields after decompression.  The \fBspace savings\fP
+is calculated  by (1 \- \fBheaders\fP  / \fBdecompressed(headers)\fP) *
+100.  For HTTP/1.1, this is usually  0.00%, since it does not have
+header compression.  For HTTP/2 and SPDY, it shows some insightful
+numbers.
 .TP
 .B data
 The number of response body bytes received from the server.
diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst
index 6087c141..5a9f8321 100644
--- a/doc/h2load.1.rst
+++ b/doc/h2load.1.rst
@@ -242,10 +242,14 @@ traffic
     requests were made via TLS, this value is the number of decrypted
     bytes.
   headers
-    The number of response header bytes from the server without
-    decompression.  For HTTP/2, this is the sum of the payload of
-    HEADERS frame.  For SPDY, this is the sum of the payload of
-    SYN_REPLY frame.
+    The  number  of response  header  bytes  from the  server  without
+    decompression.  The  ``space savings`` shows efficiency  of header
+    compression.  Let ``decompressed(headers)`` to the number of bytes
+    used for header fields after decompression.  The ``space savings``
+    is calculated  by (1 - ``headers``  / ``decompressed(headers)``) *
+    100.  For HTTP/1.1, this is usually  0.00%, since it does not have
+    header compression.  For HTTP/2 and SPDY, it shows some insightful
+    numbers.
   data
     The number of response body bytes received from the server.
 
diff --git a/doc/nghttp.1 b/doc/nghttp.1
index 023257a3..1029cb57 100644
--- a/doc/nghttp.1
+++ b/doc/nghttp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "October 25, 2015" "1.4.0" "nghttp2"
+.TH "NGHTTP" "1" "November 12, 2015" "1.4.1-DEV" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 client
 .
@@ -58,7 +58,7 @@ Discard downloaded data.
 .TP
 .B \-O, \-\-remote\-name
 Save  download  data  in  the  current  directory.   The
-filename is  derived from URI.   If URI ends  with \(aq\fI/\fP\(aq,
+filename is  derived from  URI.  If  URI ends  with \(aq\fI/\fP\(aq,
 \(aqindex.html\(aq  is used  as a  filename.  Not  implemented
 yet.
 .UNINDENT
diff --git a/doc/nghttp.1.rst b/doc/nghttp.1.rst
index c2ece836..128eeab6 100644
--- a/doc/nghttp.1.rst
+++ b/doc/nghttp.1.rst
@@ -36,7 +36,7 @@ OPTIONS
 .. option:: -O, --remote-name
 
     Save  download  data  in  the  current  directory.   The
-    filename is  derived from URI.   If URI ends  with '*/*',
+    filename is  derived from  URI.  If  URI ends  with '*/*',
     'index.html'  is used  as a  filename.  Not  implemented
     yet.
 
diff --git a/doc/nghttpd.1 b/doc/nghttpd.1
index 91dc8ace..06ac32d6 100644
--- a/doc/nghttpd.1
+++ b/doc/nghttpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "October 25, 2015" "1.4.0" "nghttp2"
+.TH "NGHTTPD" "1" "November 12, 2015" "1.4.1-DEV" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 server
 .
@@ -172,6 +172,14 @@ Send back uploaded content if method is POST or PUT.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-mime\-types\-file=<PATH>
+Path  to file  that contains  MIME media  types and  the
+extensions that represent them.
+.sp
+Default: \fB/etc/mime.types\fP
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-\-version
 Display version information and exit.
 .UNINDENT
diff --git a/doc/nghttpd.1.rst b/doc/nghttpd.1.rst
index 29ba9724..6b33b0ea 100644
--- a/doc/nghttpd.1.rst
+++ b/doc/nghttpd.1.rst
@@ -132,6 +132,13 @@ OPTIONS
 
     Send back uploaded content if method is POST or PUT.
 
+.. option:: --mime-types-file=<PATH>
+
+    Path  to file  that contains  MIME media  types and  the
+    extensions that represent them.
+
+    Default: ``/etc/mime.types``
+
 .. option:: --version
 
     Display version information and exit.
diff --git a/doc/nghttpx.1 b/doc/nghttpx.1
index c5d8ab94..8c0a577f 100644
--- a/doc/nghttpx.1
+++ b/doc/nghttpx.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "October 25, 2015" "1.4.0" "nghttp2"
+.TH "NGHTTPX" "1" "November 12, 2015" "1.4.1-DEV" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 proxy
 .