--- a/src/upmpdcli.conf-dist
+++ b/src/upmpdcli.conf-dist
@@ -5,7 +5,53 @@
 # The command line options have higher priorities than the values in
 # this file.
 
+
 # <grouptitle>Upmpdcli general parameters</grouptitle>
+
+# <var name="logfilename" type="fn"><brief>Log file
+# name.</brief><descr>Defaults to stderr. This can also be specified as -d
+# logfilename.</descr></var>
+#logfilename = 
+
+# <var name="loglevel" type="int" values="0 5 2"><brief>Log
+# level.</brief><descr>Can also be specified as -l loglevel.</descr></var>
+#loglevel = 2
+
+# <var name="pkgdatadir" type="dfn"><brief>XML and other constant data storage
+# directory.</brief><descr>Default: '$prefix/share/upmpcli' (e.g.:
+# '/usr/share/upmpdcli').</descr></var>
+#pkgdatadir=/usr/share/upmpdcli
+
+# <var name="pidfile" type="fn"><brief>Name of lock file used to store the
+# current process pid.</brief><descr>Only used if the process is launched
+# by user root. Used by the init system, and to avoid multiple
+# instances. The only reason to change the value is if you actually want to
+# have several instances running (also change cachedir in this
+# case).</descr></var>
+#pidfile = /var/run/upmpdcli.pid
+
+
+# <grouptitle>UPnP network parameters</grouptitle>
+
+# <var name="upnpiface" type="cstr" values="dynamic"><brief>Network interface to
+# use for UPnP.</brief><descr>libupnp/pupnp only supports communicating on
+# a single interface and will use the first found, this allows forcing the
+# use of another interface.</descr></var>
+#upnpiface = 
+
+# <var name="upnpip" type="string"><brief>IP address to use for UPnP, 
+# alternative to using an interface name.</brief></var>
+#upnpip = 
+
+# <var name="upnpport" type="int" values="0 65635 49152"><brief>Port number
+# used for UPnP.</brief><descr>libupnp/pupnp defaults to using the first
+# free port after 49152. Note that clients do not need to know about the
+# value, which is automatically discovered.</descr></var>
+#upnpport = 
+
+
+
+# <grouptitle>Media Renderer parameters</grouptitle>
 
 # <var name="friendlyname" type="string"><brief>"Friendly Name" for the
 # UPnP Media Renderer.</brief><descr>This will be displayed by most Control
@@ -24,15 +70,6 @@
 # for most usages. There should be little reason to turn it
 # off.</descr></var>
 #openhome = 1
-
-# <var name="logfilename" type="fn"><brief>Log file
-# name.</brief><descr>Defaults to stderr. This can also be specified as -d
-# logfilename.</descr></var>
-#logfilename = 
-
-# <var name="loglevel" type="int" values="0 5 2"><brief>Log
-# level.</brief><descr>Can also be specified as -l loglevel.</descr></var>
-#loglevel = 2
 
 # <var name="checkcontentformat" type="bool" values="1"><brief>Check that
 # input format is supported.</brief><descr>Extract the protocolinfo
@@ -51,11 +88,6 @@
 # up.</descr></var>
 #iconpath = /usr/share/upmpdcli/icon.png
 
-# <var name="pkgdatadir" type="dfn"><brief>XML and other constant data storage
-# directory.</brief><descr>Default: '$prefix/share/upmpcli' (e.g.:
-# '/usr/share/upmpdcli').</descr></var>
-#pkgdatadir=/usr/share/upmpdcli
-
 # <var name="cachedir" type="dfn"><brief>Directory used to store cached
 # data</brief><descr>Only used for the OpenHome queue metadata for now.
 # The default value is ~/.cache/upmpdcli for normal users or
@@ -70,101 +102,6 @@
 # HTTP server). Default: '$pkgdatadir/presentation.html'.</descr></var>
 #presentationhtml = /usr/share/upmpdcli/presentation.html
 
-# <var name="pidfile" type="fn"><brief>Name of lock file used to store the
-# current process pid.</brief><descr>Only used if the process is launched
-# by user root. Used by the init system, and to avoid multiple
-# instances. The only reason to change the value is if you actually want to
-# have several instances running (also change cachedir in this
-# case).</descr></var>
-#pidfile = /var/run/upmpdcli.pid
-
-# <grouptitle>Tidal streaming service parameters</grouptitle>
-
-# <var name="tidaluser" type="string"><brief>Tidal user name.</brief>
-# <descr>Your Tidal login name.</descr></var>
-#tidaluser = your tidal user name
-# <var name="tidalpass" type="string"><brief>Tidal password.</brief>
-# <descr>The password for your Tidal account.</descr></var>
-#tidalpass = your Tidal password
-# <var name="tidalquality" type="cstr" "values="low high lossless">
-# <brief>Tidal stream quality.</brief> <descr>'low' and 'high' are aac
-# streams. 'lossless' is FLAC and will only work if your subscription
-# allows it.</descr></var>
-#tidalquality = low/high/lossless
-
-# <grouptitle>Qobuz streaming service parameters</grouptitle>
-
-# <var name="qobuzuser" type="string"><brief>Qobuz user name.</brief>
-# <descr>Your Qobuz login name.</descr></var>
-#qobuzuser = me@some.place
-# <var name="qobuzpass" type="string"><brief>Qobuz password.</brief>
-# <descr>The password for your Qobuz account.</descr></var>
-#qobuzpass = agoodpassword
-# <var name="qobuzformatid" type="cstr" "values="5 7">
-# <brief>Qobuz stream quality.</brief> <descr>5 for mp3/320, 7 for FLAC if
-# your subscription allows it.</descr></var>
-#qobuzformatid = 5
-
-# <grouptitle>Google Music streaming service parameters</grouptitle>
-
-# <var name="gmusicuser" type="string"><brief>Google Music user name.</brief>
-# <descr>Your Google Music login name (probably a gmail address).</descr></var>
-#gmusicuser = me@gmail.com
-# <var name="gmusicpass" type="string"><brief>Google Music password.</brief>
-# <descr>The password for your Google Music account.</descr></var>
-#gmusicpass = agoodpassword
-# <var name="gmusicquality" type="cstr" "values="hi med low">
-# <brief>Google Music stream quality.</brief> <descr>'hi' for mp3/320, 'med'
-# for mp3/160, 'low' for mp3/128.</descr></var>
-#gmusicquality = med
-# <var name="gmusicdeviceid" type="string"> <brief>Google Music device
-# id.</brief> <descr>Your system MAC address will be used by default, but
-# this will count against the maximum count of registered devices for this
-# account.  You can set the gmusicdeviceid value to the device ID from a
-# phone or tablet on which you also use Google Play Music.</descr></var>
-#gmusicdeviceid =
-
-# <grouptitle>Local Media Server parameters</grouptitle>
-
-# <var name="uprcluser" type="string"><brief>Bogus user name variable.</brief>
-# <descr>Used for consistency with other Media Server plugins to decide if
-# the service should be started (so, do set it if you want a Media Server).
-# </descr></var>
-#uprcluser = bugsbunny
-
-# <var name="uprclmediadirs" type="string"> <brief>Media
-# directories</brief><descr>This is a space-separated list of directories
-# to explore for music files. This is used directly as the recoll "topdirs"
-# value, so you can use double-quote quoting for paths with embedded
-# spaces.</descr></var>
-#uprclmediadirs = /tmp
-
-# <var name="uprclhostport" type="string"><brief>HTTP host and ports for
-# serving media files</brief><descr>The Media Server HTTP server will run
-# on this address and port, which will also be inserted on the URLs we
-# produce. If the variable is not set, we will use port 9090 and the first
-# non-loopback ipv4 address in "ip addr" output, which may be right or
-# not. Example: 192.168.1.1:9090</descr></var>
-#uprclhostport = 192.168.4.4:9090
-
-# <var name="uprclpaths" type="string"><brief></brief><descr>This is used
-# to translate real path to ones relative to the HTTP server doc tree. It
-# also performs a form of access control. If this is not set, uprcl will
-# use a null translation for each of the uprclmediadirs
-# entries.</descr></var> 
-#uprclpaths =
-
-# <var name="uprclconfdir" type="dfn"><brief>Recoll index
-# directory</brief><descr>This is usually not defined and defaults to
-# /var/cache/upmpdcli/uprcl</descr></var>
-#uprclconfdir = /var/cache/upmpdcli/uprcl
-
-# <var name="uprclautostart" type="bool"><brief>Initialize uprcl as soon as
-# upmpdcli starts</brief><descr>This is useful because uprcl initialization
-# can take quite some time so it is better not to wait for the first
-# access. The general default is false for the autostart variables, so this
-# is normally explicitely set to true.</descr></var>
-uprclautostart = 1
 
 
 # <grouptitle>MPD parameters</grouptitle>
@@ -191,23 +128,6 @@
 # 0|1.</descr></var>
 #ownqueue = 1
 
-# <grouptitle>UPnP network parameters</grouptitle>
-
-# <var name="upnpiface" type="cstr" values="dynamic"><brief>Network interface to
-# use for UPnP.</brief><descr>libupnp/pupnp only supports communicating on
-# a single interface and will use the first found, this allows forcing the
-# use of another interface.</descr></var>
-#upnpiface = 
-
-# <var name="upnpip" type="string"><brief>IP address to use for UPnP, 
-# alternative to using an interface name.</brief></var>
-#upnpip = 
-
-# <var name="upnpport" type="int" values="0 65635 49152"><brief>Port number
-# used for UPnP.</brief><descr>libupnp/pupnp defaults to using the first
-# free port after 49152. Note that clients do not need to know about the
-# value, which is automatically discovered.</descr></var>
-#upnpport = 
 
 # <grouptitle>Audio control hooks</grouptitle>
 
@@ -338,6 +258,111 @@
 # inbetween).</descr></var>
 #ohmetasleep = 0
 
+
+# <grouptitle>Media Server general parameters</grouptitle>
+
+# <var name="msfriendlyname" type="string"><brief>Friendly name for the
+# Media Server (if enabled).</brief><descr>The default is to append
+# "-mediaserver" to the friendlyname value.</descr></var>
+#msfriendlyname = UpMpd-mediaserver
+
+# <var name="plgmicrohttpport" type="int"><brief>IP port for the
+# tidal/qobuz/gmusic local HTTP service.</brief> <descr>The URLs for tracks
+# streamed from these services point to a local microhttpd server running on
+# this port (it uses redirection to the actual service URL when
+# actually streaming). The default is 49149.</descr></var>
+#plgmicrohttpport = 49149
+
+# <grouptitle>Tidal streaming service parameters</grouptitle>
+
+# <var name="tidaluser" type="string"><brief>Tidal user name.</brief>
+# <descr>Your Tidal login name.</descr></var>
+#tidaluser = your tidal user name
+# <var name="tidalpass" type="string"><brief>Tidal password.</brief>
+# <descr>The password for your Tidal account.</descr></var>
+#tidalpass = your Tidal password
+# <var name="tidalquality" type="cstr" "values="low high lossless">
+# <brief>Tidal stream quality.</brief> <descr>'low' and 'high' are aac
+# streams. 'lossless' is FLAC and will only work if your subscription
+# allows it.</descr></var>
+#tidalquality = low/high/lossless
+
+# <grouptitle>Qobuz streaming service parameters</grouptitle>
+
+# <var name="qobuzuser" type="string"><brief>Qobuz user name.</brief>
+# <descr>Your Qobuz login name.</descr></var>
+#qobuzuser = me@some.place
+# <var name="qobuzpass" type="string"><brief>Qobuz password.</brief>
+# <descr>The password for your Qobuz account.</descr></var>
+#qobuzpass = agoodpassword
+# <var name="qobuzformatid" type="cstr" "values="5 7">
+# <brief>Qobuz stream quality.</brief> <descr>5 for mp3/320, 7 for FLAC if
+# your subscription allows it.</descr></var>
+#qobuzformatid = 5
+
+# <grouptitle>Google Music streaming service parameters</grouptitle>
+
+# <var name="gmusicuser" type="string"><brief>Google Music user name.</brief>
+# <descr>Your Google Music login name (probably a gmail address).</descr></var>
+#gmusicuser = me@gmail.com
+# <var name="gmusicpass" type="string"><brief>Google Music password.</brief>
+# <descr>The password for your Google Music account.</descr></var>
+#gmusicpass = agoodpassword
+# <var name="gmusicquality" type="cstr" "values="hi med low">
+# <brief>Google Music stream quality.</brief> <descr>'hi' for mp3/320, 'med'
+# for mp3/160, 'low' for mp3/128.</descr></var>
+#gmusicquality = med
+# <var name="gmusicdeviceid" type="string"> <brief>Google Music device
+# id.</brief> <descr>Your system MAC address will be used by default, but
+# this will count against the maximum count of registered devices for this
+# account.  You can set the gmusicdeviceid value to the device ID from a
+# phone or tablet on which you also use Google Play Music.</descr></var>
+#gmusicdeviceid =
+
+# <grouptitle>Local Media Server parameters</grouptitle>
+
+# <var name="uprcluser" type="string"><brief>Bogus user name variable.</brief>
+# <descr>Used for consistency with other Media Server plugins to decide if
+# the service should be started (so, do set it if you want a Media Server).
+# </descr></var>
+#uprcluser = bugsbunny
+
+# <var name="uprclmediadirs" type="string"> <brief>Media
+# directories</brief><descr>This is a space-separated list of directories
+# to explore for music files. This is used directly as the recoll "topdirs"
+# value, so you can use double-quote quoting for paths with embedded
+# spaces.</descr></var>
+#uprclmediadirs = /tmp
+
+# <var name="uprclhostport" type="string"><brief>HTTP host and ports for
+# serving media files</brief><descr>The Media Server HTTP server will run
+# on this address and port, which will also be inserted on the URLs we
+# produce. If the variable is not set, we will use port 9090 and the first
+# non-loopback ipv4 address in "ip addr" output, which may be right or
+# not. Example: 192.168.1.1:9090</descr></var>
+#uprclhostport = 192.168.4.4:9090
+
+# <var name="uprclpaths" type="string"><brief></brief><descr>This is used
+# to translate real path to ones relative to the HTTP server doc tree. It
+# also performs a form of access control. If this is not set, uprcl will
+# use a null translation for each of the uprclmediadirs
+# entries.</descr></var> 
+#uprclpaths =
+
+# <var name="uprclconfdir" type="dfn"><brief>Recoll index
+# directory</brief><descr>This is usually not defined and defaults to
+# /var/cache/upmpdcli/uprcl</descr></var>
+#uprclconfdir = /var/cache/upmpdcli/uprcl
+
+# <var name="uprclautostart" type="bool"><brief>Initialize uprcl as soon as
+# upmpdcli starts</brief><descr>This is useful because uprcl initialization
+# can take quite some time so it is better not to wait for the first
+# access. The general default is false for the autostart variables, so this
+# is normally explicitely set to true.</descr></var>
+uprclautostart = 1
+
+
+
 # <grouptitle>Songcast Receiver parameters</grouptitle>
 
 # Parameters for the Songcast modes. These are read by either/both the