diff --git a/contrib/mt-daapd.conf.templ b/contrib/mt-daapd.conf.templ
index 3a6fec87..c68475e1 100644
--- a/contrib/mt-daapd.conf.templ
+++ b/contrib/mt-daapd.conf.templ
@@ -1,123 +1,62 @@
 #
 # This is the mt-daapd config file.
 #
-# If you have problems or questions with the format of this file,
-# direct your questions to rpedde@users.sourceforge.net.
-#
 # Questions and discussions about the format and content of this
 # config file can probably be obtained by consulting the wiki:
 #
 # http://wiki.fireflymediaserver.org/Config_File
-#
-# Or by asking questions on the forums at
-#
-# http://forums.fireflymediaserver.org
-#
-#
 
 [general]
 
-#
-# web_root (required)
-#
 # Location of the admin web pages.
-#
-# If you installed from .RPM, .deb, or tarball with --prefix=/usr, then
-# this is correct. 
-#
-# If you installed from tarball without --prefix=/usr, then the correct
-# path is probably /usr/local/share/mt-daapd/admin-root.
-#
 
 web_root = @prefix@/share/mt-daapd/admin-root
 
-#
-# port (required)
-#
 # What port to listen on.  It is possible to use a different
 # port, but this is the default iTunes port
-#
 
 port = 3689
 
-#
-# admin_pw (required)
-#
 # This is the password to the administrative pages
-#
 
 admin_pw = mt-daapd
 
-
-#
-# db_type (required)
-#
 # This is what kind of backend database to store the song
-# info in.  Valid choices are "sqlite" and "sqlite3".
-#
+# info in.  "sqlite3" is the only valid choice.
 
-db_type = sqlite
+db_type = sqlite3
 
-#
-# db_parms
-#
 # This is any extra information the db needs to connect.
 # in the case of sqlite and sqlite3, this is the name
 # of the directory to store the database in
-#
-# If you installed from RPM or .deb, this path likely already
-# exists.  If not, then you must create it.  The directory itself
-# must be writable by the "runas" user.
-#
 
 db_parms = @dbdir@
 
-#
-# mp3_dir (required)
-#
 # Location of the mp3 files to share.  Note that because the
 # files are stored in the database by inode, these must be
 # in the same physical filesystem.
-#
 
-mp3_dir = /mnt/mp3
+mp3_dir = /srv/media
 
-#
-# servername (required)
-#
 # This is both the name of the server as advertised
 # via rendezvous, and the name of the database
 # exported via DAAP.  Also know as "What shows up in iTunes".
-#
 
 servername = Firefly %v on %h
 
-#
-# runas (required)
-#
 # This is the user to drop privs to if running as
 # root.  If mt-daapd is not started as root, this
 # configuration option is ignored.  Notice that this
 # must be specified whether the server is running
 # as root or not.
-#
-# This is also ignored on Windows.
-#
 
-runas = nobody
+runas = mt-daapd
 
-#
-# password (optional)
-#
 # This is the password required to listen to MP3 files
 # i.e. the password that iTunes prompts for
-#
 
 #password = mp3
 
-#
-# extensions (optional)
-#
 # These are the file extensions that the daap server will
 # try to index and serve.  By default, it only indexes and
 # serves .mp3 files.  It can also server .m4a and .m4p files,
@@ -129,23 +68,10 @@ runas = nobody
 # Failing that, one can use server-side conversion to transcode
 # non-standard (.ogg, .flac) music to wav on the server side.
 # See the ssc_* options below.
-#
-# To be able to index .ogg files, you'll need to have configured
-# with --enable-oggvorbis.  For .flac, --enable-flac, for .mpc,
-# --enable-musepack.
-#
 
-extensions = .mp3,.m4a,.m4p
+extensions = .mp3,.m4a,.m4p,.ogg,.flac,.mpc
 
-#
-# ssc_codectypes (optional)
-#
-# List of codectypes for files that the daap server should
-# perform internal format conversion and present to clients
-# as WAV files.  The file extensions that these codectypes correspond
-# to must also be present in 'extensions'
-# configuration value, or files are not probed in the first
-# place.
+# Comma separated list of formats to never transcode. (Nothing by default)
 #
 # Valid codectypes:
 #
@@ -157,13 +83,9 @@ extensions = .mp3,.m4a,.m4p
 # flac - for flac (.flac, .fla)
 # mpc for musepack (.mpc, .mpp, .mp+)
 # alac for alac (.m4a)
-#
 
-ssc_codectypes = ogg,flac,alac
+#never_transcode = ogg
 
-#
-# ssc_prog (optional)
-#
 # Program that is used in server side format conversion.
 # Program must accept following command line syntax:
 #     ssc_prog filename offset length ...
@@ -177,45 +99,28 @@ ssc_codectypes = ogg,flac,alac
 # output by the ssc_prog program.  This is typically
 # a script that is a front end for different conversion tools
 # handling different formats.
-#
 
-ssc_prog = @prefix@/bin/mt-daapd-ssc.sh
+#ssc_prog = @prefix@/bin/mt-daapd-ssc.sh
 
-#
-# logfile (optional)
-#
 # This is the file to log to.  If this is not configured,
 # then it will log to the syslog.
 #
 # Not that the -d <level> switch will control the log verbosity.
 # By default, it runs at log level 1.  Log level 9 will churn
 # out scads of useless debugging information.  Values in between
-# will vary the amount of logging you get.
-#
+# will vary the amount of logging you get. However, you must log
+# to a file to see this debugging information (debug information will
+# not appear in syslog.)
 
 #logfile = /var/log/mt-daapd.log
 
-#
-# rescan_interval
-#
 # How often to check the file system to see if any mp3 files
 # have been added or removed. 
 #
 # if not specified, the default is 0, which disables background scanning.
-#
-# If background rescanning is disabled, a scan can still be forced from the 
-# "status" page of the administrative web interface
-#
-# Setting a rescan_interval lower than the time it takes to rescan
-# won't hurt anything, it will just waste CPU, and make connect times
-# to the daap server longer.
-#
-#
 
 #rescan_interval = 300
 
-# always_scan 
-#
 # The default behavior is not not do background rescans of the
 # filesystem unless there are clients connected.  The thought is to
 # allow the drives to spin down unless they are in use.  This might be
@@ -223,12 +128,8 @@ ssc_prog = @prefix@/bin/mt-daapd-ssc.sh
 # 24x7.  Forcing a scan through the web interface will always work
 # though, even if no users are connected.
 
-# always_scan = 0
+#always_scan = 0
 
-#
-# scan_type
-# 
-#
 # This sets how aggressively mp3 files should be scanned to determine
 # file length.  There are three values:
 #
@@ -249,40 +150,27 @@ ssc_prog = @prefix@/bin/mt-daapd-ssc.sh
 #   This should result in accurate song times, but will take the most
 #   time.  Again, this will only have to be incurred the first time
 #   the file is indexed.
-# 
 
 scan_type = 2
 
-#
-# compress
-#
 # Whether to use gzip content-encoding when transferring playlists etc.
 # This was contributed as a patch by Ciamac Moallemi just prior to the 0.2.1
 # release, and as such, hasn't gotten as much testing as other features.
-#
-# This feature should substantially speed up transfers of large databases
-# and playlists.
-#
-# It will eventually default to 1, but currently it defaults to 0.
-#
 
 #compress = 0
 
 [plugins]
 plugin_dir = @libdir@/mt-daapd/plugins
 
-
 [scanning]
-
 # should playlists be processed at all?
-#
+
 process_playlists = 1
 
- 
 # should itunes xml files be processed?
-#
+
 process_itunes = 1
 
 # should m3u files be processed?
-#
+
 process_m3u = 1