diff --git a/doc/h2load.1 b/doc/h2load.1
index eb2b0b0f..566c7e36 100644
--- a/doc/h2load.1
+++ b/doc/h2load.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "February 22, 2015" "0.7.5-DEV" "nghttp2"
+.TH "H2LOAD" "1" "February 27, 2015" "0.7.5" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
diff --git a/doc/nghttp.1 b/doc/nghttp.1
index bca17ae4..223337ee 100644
--- a/doc/nghttp.1
+++ b/doc/nghttp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "February 22, 2015" "0.7.5-DEV" "nghttp2"
+.TH "NGHTTP" "1" "February 27, 2015" "0.7.5" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 experimental client
 .
diff --git a/doc/nghttpd.1 b/doc/nghttpd.1
index 38d9a740..dd8b1e17 100644
--- a/doc/nghttpd.1
+++ b/doc/nghttpd.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "February 22, 2015" "0.7.5-DEV" "nghttp2"
+.TH "NGHTTPD" "1" "February 27, 2015" "0.7.5" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 experimental server
 .
@@ -56,6 +56,12 @@ Set  path  to  server\(aqs  certificate.   Required  unless
 .SH OPTIONS
 .INDENT 0.0
 .TP
+.B \-a, \-\-address=<ADDR>
+The address to bind to.  If not specified the default IP
+address determined by getaddrinfo is used.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-D, \-\-daemon
 Run in a background.  If \fI\-D\fP is used, the current working
 directory is  changed to \(aq\fI/\fP\(aq.  Therefore  if this option
diff --git a/doc/nghttpd.1.rst b/doc/nghttpd.1.rst
index 522530f6..1eb1cf15 100644
--- a/doc/nghttpd.1.rst
+++ b/doc/nghttpd.1.rst
@@ -30,6 +30,11 @@ HTTP/2 experimental server
 OPTIONS
 -------
 
+.. option:: -a, --address=<ADDR>
+
+    The address to bind to.  If not specified the default IP
+    address determined by getaddrinfo is used.
+
 .. option:: -D, --daemon
 
     Run in a background.  If :option:`-D` is used, the current working
diff --git a/doc/nghttpx.1 b/doc/nghttpx.1
index c35749ca..38cb5606 100644
--- a/doc/nghttpx.1
+++ b/doc/nghttpx.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "February 22, 2015" "0.7.5-DEV" "nghttp2"
+.TH "NGHTTPX" "1" "February 27, 2015" "0.7.5" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 experimental proxy
 .
@@ -834,6 +834,17 @@ associated stream\(aqs status code must be 200.
 .UNINDENT
 .sp
 These limitations may be loosened in the future release.
+.SH UNIX DOMAIN SOCKET
+.sp
+nghttpx supports UNIX domain socket with a filename for both frontend
+and backend connections.
+.sp
+Please note that current nghttpx implementation does not delete a
+socket with a filename.  And on start up, if nghttpx detects that the
+specified socket already exists in the file system, nghttpx first
+deletes it.  However, if SIGUSR2 is used to execute new binary and
+both old and new configurations use same filename, new binary does not
+delete the socket and continues to use it.
 .SH SEE ALSO
 .sp
 \fInghttp(1)\fP, \fInghttpd(1)\fP, \fIh2load(1)\fP
diff --git a/doc/nghttpx.1.rst b/doc/nghttpx.1.rst
index dc3876b6..6c5b457f 100644
--- a/doc/nghttpx.1.rst
+++ b/doc/nghttpx.1.rst
@@ -747,6 +747,19 @@ Currently, the following restrictions are applied for server push:
 
 These limitations may be loosened in the future release.
 
+UNIX DOMAIN SOCKET
+------------------
+
+nghttpx supports UNIX domain socket with a filename for both frontend
+and backend connections.
+
+Please note that current nghttpx implementation does not delete a
+socket with a filename.  And on start up, if nghttpx detects that the
+specified socket already exists in the file system, nghttpx first
+deletes it.  However, if SIGUSR2 is used to execute new binary and
+both old and new configurations use same filename, new binary does not
+delete the socket and continues to use it.
+
 SEE ALSO
 --------