Index: manual/appendix/file_formats.tex
===================================================================
--- manual/appendix/file_formats.tex	(revision 29842)
+++ manual/appendix/file_formats.tex	(working copy)
@@ -172,4 +172,28 @@
     Sound Interface Device & \fname{.sid} & \\
     SPC700 & \fname{.spc} & \\
   \end{rbtabular}
+  
+  \newpage
+  \section{\label{ref:SupportedMetadata}Supported metadata tags}
+    Rockbox supports different metadata formats. In general those tag formats
+    are ID3 (v1 and v2), APE (v1 and v2), Vorbis, MP4 and ASF. Few codecs use
+    codec specific tags, several codecs do not use any tags yet. The following
+    table gives an overview about what tag types rockbox supports for which
+    audio file extension.
+    
+    \note{There is always only \emph{one} tag type supported for each file
+    extension.}
+    
+    \begin{rbtabular}{\textwidth}{lX}%
+    {\textbf{Extension} & \textbf{Tag type}}{}{}
+      \fname{.mp1, .mpa, .mp2, .mp3, .rm, .ra, .rmvb, .tta}   & ID3 \\
+      \fname{.mpc, .ape, .mac, .wv}                           & APE \\
+      \fname{.ogg, .oga, .spx, .flac}                         & Vorbis \\
+      \fname{.m4a, .m4b, .mp4}                                & MP4 \\
+      \fname{.wma, .wmv, .asf}                                & ASF \\
+      \fname{.mmf, .mod, .nsf, .nsfe, .sap, .sid, .spc}       & Codec specific \\
+      \fname{.a52, .ac3, .adx, .oma, .aa3, .aif, .aiff, .au,} & None \\
+      \fname{.snd, .shn, .vox, .w64, .wav, .cmc, .cm3, .cmr,} & None \\
+      \fname{.cms, .dmc, .dlt, .mpt, .mpd}                    & None \\
+    \end{rbtabular}
 }