diff --git a/doc/h2load.1 b/doc/h2load.1
index 6416eb1c..9ab126c4 100644
--- a/doc/h2load.1
+++ b/doc/h2load.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "August 09, 2015" "1.2.0" "nghttp2"
+.TH "H2LOAD" "1" "August 14, 2015" "1.2.1" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
@@ -196,9 +196,9 @@ The number of requests failed, including HTTP level failures
 .TP
 .B errored
 The number of requests failed, except for HTTP level failures.
-status code.  This is the subset of the number reported in
-\fBfailed\fP and most likely the network level failures or stream
-was reset by RST_STREAM.
+This is the subset of the number reported in \fBfailed\fP and most
+likely the network level failures or stream was reset by
+RST_STREAM.
 .UNINDENT
 .TP
 .B status codes
diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst
index 15903963..0f9aaa3f 100644
--- a/doc/h2load.1.rst
+++ b/doc/h2load.1.rst
@@ -154,9 +154,9 @@ requests
     (non-successful HTTP status code).
   errored
     The number of requests failed, except for HTTP level failures.
-    status code.  This is the subset of the number reported in
-    ``failed`` and most likely the network level failures or stream
-    was reset by RST_STREAM.
+    This is the subset of the number reported in ``failed`` and most
+    likely the network level failures or stream was reset by
+    RST_STREAM.
 
 status codes
   The number of status code h2load received.
diff --git a/doc/nghttp.1 b/doc/nghttp.1
index f7d9b940..784a29f0 100644
--- a/doc/nghttp.1
+++ b/doc/nghttp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "August 09, 2015" "1.2.0" "nghttp2"
+.TH "NGHTTP" "1" "August 14, 2015" "1.2.1" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 experimental client
 .
diff --git a/doc/nghttpd.1 b/doc/nghttpd.1
index 7c4b1064..6c70b2ef 100644
--- a/doc/nghttpd.1
+++ b/doc/nghttpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "August 09, 2015" "1.2.0" "nghttp2"
+.TH "NGHTTPD" "1" "August 14, 2015" "1.2.1" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 experimental server
 .
diff --git a/doc/nghttpx.1 b/doc/nghttpx.1
index c7812a10..46be65f5 100644
--- a/doc/nghttpx.1
+++ b/doc/nghttpx.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "August 09, 2015" "1.2.0" "nghttp2"
+.TH "NGHTTPX" "1" "August 14, 2015" "1.2.1" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 experimental proxy
 .
@@ -1037,6 +1037,9 @@ translated into Python.
 The script file is usually installed under
 \fB$(prefix)/share/nghttp2/\fP directory.  The actual path to script can
 be customized using \fI\%\-\-fetch\-ocsp\-response\-file\fP option.
+.sp
+If OCSP query is failed, previous OCSP response, if any, is continued
+to be used.
 .SH TLS SESSION RESUMPTION
 .sp
 nghttpx supports TLS session resumption through both session ID and
diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst
index 96e8b414..beeb0916 100644
--- a/doc/nghttpx.1.rst
+++ b/doc/nghttpx.1.rst
@@ -943,6 +943,9 @@ The script file is usually installed under
 ``$(prefix)/share/nghttp2/`` directory.  The actual path to script can
 be customized using :option:`--fetch-ocsp-response-file` option.
 
+If OCSP query is failed, previous OCSP response, if any, is continued
+to be used.
+
 TLS SESSION RESUMPTION
 ----------------------