diff --git a/doc/config b/doc/config
index 9068e64..f182dc0 100644
--- a/doc/config
+++ b/doc/config
@@ -47,6 +47,20 @@ Sections:
       Default: /var/lib/mpd/music
   * skip <directory>: String. Files in <directory> will be ignored. Note that
       <directory> can be any expression accepted by find.
+  * tag-guessing <expression>: String. Filenaming scheme to allow for guessing
+      tags from filenames and directories. The placeholders are the same as thosefor rename below:
+        %{album},
+        %{albumartist},
+        %{artist},
+        %{disc},
+        %{genre},
+        %{releasecountry},
+        %{title},
+        %{track},
+        %{year}.
+  * tag-guessing-triggers <list>: String. List of tags, separated by commas.
+      If any of the tgs in this list cannot be fetched by tag readers, guessing
+      will be attempted.
 
 [<some arbitrary string>]
   Each section not named 'general' or 'source' will define a new destination.
diff --git a/doc/example.cfg b/doc/example.cfg
index ffea7f7..7eb7488 100644
--- a/doc/example.cfg
+++ b/doc/example.cfg
@@ -49,6 +49,25 @@ skip			/last
 skip			/lastfm
 skip			/zzz-atrier
 
+# Tag guessing expresssion. Uses same values as "rename" below. This is used to
+# guess tags from filenames and paths. This is useful for files with no tags but
+# can lead to issues if a strict naming scheme is not used.
+# Tag guessing disabled if unset (default).
+#       %{album},
+#       %{albumartist},
+#       %{artist},
+#       %{disc} (1 digit),
+#       %{genre},
+#       %{releasecountry} (2 letter code),
+#       %{title},
+#       %{track} (2 digits),
+#       %{year}.
+#tag-guessing		%{genre}/%{albumartist}/%{year}-%{album}-%{releasecountry}/%{disk}%{track}--%{artist}-%{title}
+
+# Guess tags on missing infos:
+#tag-missing-triggers artist,albumartist,title,track,year,genre
+
+
 [Vorbis]
 # Each section not named 'general' or 'source' will define a new destination.