diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index b6c6f7bb1..e4b4d29a9 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -175,6 +175,15 @@
 ###############################################################################
 
 
+# Database #######################################################################
+#
+
+#database {
+#       plugin "proxy"
+#       host "other.mpd.host"
+#       port "6600"
+#}
+
 # Input #######################################################################
 #
 
diff --git a/doc/user.xml b/doc/user.xml
index 9bf4112f7..605cb0dbb 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -714,7 +714,10 @@ systemctl start mpd.socket</programlisting>
 
         <para>
           Provides access to the database of another MPD instance
-          using <filename>libmpdclient</filename>.  Experimental!
+          using <filename>libmpdclient</filename>.  This is useful
+          when you run mount the music directory via NFS/SMB, and the
+          file server already runs a MPD instance.  Only the file
+          server needs to update the database.
         </para>
 
         <informaltable>