diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index aa92bec4d..56cc5efc7 100644
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -13,6 +13,7 @@ dist_noinst_SCRIPTS = \
EXTRA_DIST = \
docs/valgrind-listener-manpage.xml \
+ docs/valgrind-di-server-manpage.xml \
gsl16-badfree.patch \
gsl16-wavelet.patch \
posixtestsuite-1.5.1-diff.txt \
diff --git a/auxprogs/docs/valgrind-di-server-manpage.xml b/auxprogs/docs/valgrind-di-server-manpage.xml
new file mode 100644
index 000000000..deca81d0a
--- /dev/null
+++ b/auxprogs/docs/valgrind-di-server-manpage.xml
@@ -0,0 +1,99 @@
+
+ %vg-entities; ]>
+
+
+
+
+
+ valgrind-di-server
+ 1
+ Release &rel-version;
+
+
+
+ valgrind-di-server
+ Experimental debuginfo server for valgrind
+
+
+
+
+ valgrind-di-server
+ options
+
+
+
+
+
+Description
+
+valgrind-di-server accepts (multiple) connections
+from valgrind processes that use the
+ option on the specified port and serves
+(compressed) debuginfo files (in chunks) from the current working directory.
+
+
+
+
+
+
+
+Options
+
+
+
+
+ When the number of connected processes falls back to zero,
+ exit. Without this, it will run forever, that is, until you
+ send it Control-C.
+
+
+
+
+
+ By default, the server can connect to up to 50 processes.
+ Occasionally, that number is too small. Use this option to
+ provide a different limit. E.g.
+ --max-connect=100.
+
+
+
+
+
+
+ Changes the port it listens on from the default (1500).
+ The specified port must be in the range 1024 to 65535.
+ The same restriction applies to port numbers specified by the
+ option to Valgrind itself.
+
+
+
+
+
+
+
+
+
+See Also
+
+
+valgrind(1),
+&vg-docs-path; or
+&vg-docs-url;.
+
+
+
+
+
+
+Author
+
+Julian Seward.
+
+
+
+
+
+
+
diff --git a/docs/xml/manpages-index.xml b/docs/xml/manpages-index.xml
index 7d774e538..a038ee416 100644
--- a/docs/xml/manpages-index.xml
+++ b/docs/xml/manpages-index.xml
@@ -39,6 +39,10 @@
+
+
+