diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 4b55f8801..7a2db5d16 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -385,29 +385,3 @@ input {
 #id3v1_encoding			"ISO-8859-1"
 #
 ###############################################################################
-
-
-# SIDPlay decoder #############################################################
-#
-# songlength_database:
-#  Location of your songlengths file, as distributed with the HVSC.
-#  The sidplay plugin checks this for matching MD5 fingerprints.
-#  See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
-#
-# default_songlength:
-#  This is the default playing time in seconds for songs not in the
-#  songlength database, or in case you're not using a database.
-#  A value of 0 means play indefinitely.
-#
-# filter:
-#  Turns the SID filter emulation on or off.
-#
-#decoder {
-#	plugin			"sidplay"
-#	songlength_database	"/media/C64Music/DOCUMENTS/Songlengths.txt"
-#	default_songlength	"120"
-#	filter "true"
-#}
-#
-###############################################################################
-
diff --git a/doc/user.xml b/doc/user.xml
index 920454377..e76bbfc1b 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -2017,6 +2017,64 @@ buffer_size: 16384</programlisting>
         </informaltable>
       </section>
 
+      <section id="sidplay_decoder">
+        <title><varname>sidplay</varname></title>
+
+        <para>
+          C64 SID decoder based on
+          <application>libsidplay</application>.
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <thead>
+              <row>
+                <entry>Setting</entry>
+                <entry>Description</entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>
+                  <varname>songlength_database</varname>
+                  <parameter>PATH</parameter>
+                </entry>
+                <entry>
+                  Location of your songlengths file, as distributed
+                  with the HVSC.  The <varname>sidplay</varname>
+                  plugin checks this for matching MD5 fingerprints.
+                  See <ulink
+                  url="http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq">http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq</ulink>.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  <varname>default_songlength</varname>
+                  <parameter>SECONDS</parameter>
+                </entry>
+                <entry>
+                  This is the default playing time in seconds for
+                  songs not in the songlength database, or in case
+                  you're not using a database.  A value of 0 means
+                  play indefinitely.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  <varname>filter</varname>
+                  <parameter>yes|no</parameter>
+                </entry>
+                <entry>
+                  Turns the SID filter emulation on or off.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+      </section>
+
       <section>
         <title><varname>wildmidi</varname></title>