diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 8062694e32..a256a2a735 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -328,6 +328,7 @@
     \end{rbtabular}
     
     \subsection{Featureset for generic metadata tags}
+    \label{ref:featureset_for_generic_metadata_tags}
     \begin{rbtabular}{0.80\textwidth}{lXXXXX}%
     {\textbf{Feature} & \textbf{ID3} & \textbf{APE} & \textbf{Vorbis} & 
      \textbf{MP4} & \textbf{ASF}}{}{}
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 5b3549d2ab..6fd2f2d724 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -422,8 +422,9 @@ theme}. For this feature to work, there are a few requirements.
 
 \subsection{Limitations}
 
-Rockbox supports embedded album art only for formats that use ID3v2 tags, such
-as MP3. It additionally supports loading images located on the \disk{}.
+Rockbox supports embedded album art only for some specific formats, see
+\reference{ref:featureset_for_generic_metadata_tags} for full details. It additionally supports
+loading images located on the \disk{}.
 The image files must be in either BMP or JPEG format, while embedded album art
 is currently limited to JPEG. Rockbox does not support
 RLE-compressed BMP files, nor does it support progressive and multi-scan