diff --git a/doc/h2load.1 b/doc/h2load.1
index 52c0428b..e6acc547 100644
--- a/doc/h2load.1
+++ b/doc/h2load.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "May 08, 2015" "0.7.14" "nghttp2"
+.TH "H2LOAD" "1" "May 13, 2015" "0.7.15-DEV" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
diff --git a/doc/h2load.1.rst b/doc/h2load.1.rst
index a8edea27..2bc0f6a8 100644
--- a/doc/h2load.1.rst
+++ b/doc/h2load.1.rst
@@ -1,4 +1,6 @@
 
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
 .. program:: h2load
 
 h2load(1)
diff --git a/doc/nghttp.1 b/doc/nghttp.1
index 51596f6a..1ec86b1e 100644
--- a/doc/nghttp.1
+++ b/doc/nghttp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "May 08, 2015" "0.7.14" "nghttp2"
+.TH "NGHTTP" "1" "May 13, 2015" "0.7.15-DEV" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 experimental client
 .
diff --git a/doc/nghttp.1.rst b/doc/nghttp.1.rst
index 88cb8afd..7f2449b2 100644
--- a/doc/nghttp.1.rst
+++ b/doc/nghttp.1.rst
@@ -1,4 +1,6 @@
 
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
 .. program:: nghttp
 
 nghttp(1)
diff --git a/doc/nghttpd.1 b/doc/nghttpd.1
index 0c98d0d3..0da439b0 100644
--- a/doc/nghttpd.1
+++ b/doc/nghttpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "May 08, 2015" "0.7.14" "nghttp2"
+.TH "NGHTTPD" "1" "May 13, 2015" "0.7.15-DEV" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 experimental server
 .
@@ -167,6 +167,11 @@ are used.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-echo\-upload
+Send back uploaded content if method is POST or PUT.
+.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 abb9c45a..e9ac30df 100644
--- a/doc/nghttpd.1.rst
+++ b/doc/nghttpd.1.rst
@@ -1,4 +1,6 @@
 
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
 .. program:: nghttpd
 
 nghttpd(1)
@@ -126,6 +128,10 @@ OPTIONS
     hex+ASCII display).  If SSL/TLS  is used, decrypted data
     are used.
 
+.. option:: --echo-upload
+
+    Send back uploaded content if method is POST or PUT.
+
 .. option:: --version
 
     Display version information and exit.
diff --git a/doc/nghttpx.1 b/doc/nghttpx.1
index 4e5da161..34ae5be9 100644
--- a/doc/nghttpx.1
+++ b/doc/nghttpx.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "May 08, 2015" "0.7.14" "nghttp2"
+.TH "NGHTTPX" "1" "May 13, 2015" "0.7.15-DEV" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 experimental proxy
 .
diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst
index cdcbe019..efacbb44 100644
--- a/doc/nghttpx.1.rst
+++ b/doc/nghttpx.1.rst
@@ -1,4 +1,6 @@
 
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
 .. program:: nghttpx
 
 nghttpx(1)