diff --git a/forked-daapd.conf b/forked-daapd.conf
index d347a71e..2f23e69f 100644
--- a/forked-daapd.conf
+++ b/forked-daapd.conf
@@ -217,18 +217,19 @@ spotify {
 	# playlists you can set this option to true.
 #	base_playlist_disable = false
 
-	# Spotify playlists usually have many artist, and if you don't want every
-	# artist to be listed when artist browsing in Remote, you can set the 
-	# artist_override flag to true. This will use the compilation_artist as
-	# album artist for spotify items that are not in the starred playlist.
+	# Spotify playlists usually have many artist, and if you don't want
+	# every artist to be listed when artist browsing in Remote, you can set
+	# the artist_override flag to true. This will use the compilation_artist
+	# as album artist for Spotify items.
 #	artist_override = false
 
-	# Similar to the different artists in spotify playlists, the playlist items
-	# belong to different albums, and if you do not want every album to be listed
-	# when browsing in Remote, you can set the album_override flag to true. This
-	# will use the playlist name as album name for spotify items that are not in
-	# the starred playlist. Notice that if an item is in more than one playlist,
-	# it will only appear in one album when browsing (in which album is random).
+	# Similar to the different artists in Spotify playlists, the playlist
+	# items belong to different albums, and if you do not want every album
+	# to be listed when browsing in Remote, you can set the album_override
+	# flag to true. This will use the playlist name as album name for
+	# Spotify items. Notice that if an item is in more than one playlist,
+	# it will only appear in one album when browsing (in which album is
+	# random).
 #	album_override = false
 }
 
@@ -238,21 +239,22 @@ mpd {
 	# Default port is 6600, set to 0 to disable MPD support.
 #	port = 6600
 
-	# HTTP port to listen for artwork requests (only supported by some MPD clients
-	# and will need additional configuration in the MPD client to work).
-	# Set to 0 to disable serving artwork over http.
+	# HTTP port to listen for artwork requests (only supported by some MPD
+	# clients and will need additional configuration in the MPD client to
+	# work). Set to 0 to disable serving artwork over http.
 #	http_port = 0
 
-	# By default forked-daapd will - like iTunes - clear the playqueue if playback stops. 
-	# Setting clear_queue_on_stop_disable to true will keep the playlist like MPD does.
-	# Note that some dacp clients do not show the playqueue if playback is stopped.
+	# By default forked-daapd will - like iTunes - clear the playqueue if
+	# playback stops. Setting clear_queue_on_stop_disable to true will keep
+	# the playlist like MPD does. Note that some dacp clients do not show
+	# the playqueue if playback is stopped.
 #	clear_queue_on_stop_disable = false
 }
 
 # SQLite configuration (allows to modify the operation of the SQLite databases)
-# Make sure to read the SQLite documentation for the corresponding PRAGMA statements as
-# changing them from the defaults may increase the possibility of database corruptions!
-# By default the SQLite default values are used. 
+# Make sure to read the SQLite documentation for the corresponding PRAGMA
+# statements as changing them from the defaults may increase the possibility of
+# database corruptions! By default the SQLite default values are used.
 sqlite {
 	# Cache size in number of db pages for the library database
 	# (SQLite default page size is 1024 bytes and cache size is 2000 pages)