diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 0de643ae70..61e374a4da 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -87,6 +87,8 @@
                     & on, off           & N/A\\
     warn when erasing dynamic playlist
                     & on, off           & N/A\\
+    cuesheet support
+                    & on, off           & N/A\\
 %
     \opt{SWCODEC}{
       replaygain    & on, off           & N/A\\
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 88c89ba48f..29be2ab187 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -12,6 +12,8 @@
   & Audio file & 
   \opt{MASCODEC}{mp3}\opt{SWCODEC}{\emph{various}}
   & Rockbox takes you to the WPS and starts playing the file \\
+  \includegraphics[width=0.37cm]{appendix/images/icon-cuesheet.png} 
+  & Cuesheet & \fname{.cue} & View a cuesheet file \\
 \includegraphics[width=0.37cm]{appendix/images/icon-wav-file.png} 
   & Wave Audio File & \fname{.wav} & Play a WAV file \\%
 \includegraphics[width=0.37cm]{appendix/images/icon-playlist.png} 
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 45f3c9be47..29e6d6e94a 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -218,7 +218,7 @@ related to audio playback.
     \setting{Auto-Change Directory} to function properly.}
 
   %
-\opt{ipodnano,ipodvideo,ipodmini,ipod4g,ipod3g,ipodcolor}{
+\opt{ipodnano,ipodvideo,ipodmini,ipod4g,ipod3g,ipodcolor,gigabeatf}{
 \item[Pause on headphone unplug.] Enables and disables automatic pausing of 
   playback when the headphones are disconnected from the \daps{} headphone 
   socket.
@@ -256,4 +256,12 @@ related to audio playback.
   \note{See \wikilink{LastFMLog} for a further description, and for tools you 
     can use to submit your Last.fm log.}
 
+\item[Cuesheet Support.]\index{Cuesheet Support}
+  Enables reading of cuesheet files for played tracks. If a cuesheet is found
+  for a track, track markers are displayed on the progressbar and it is
+  possible to skip between the tracks within the cuesheet. Also the information
+  found in the cuesheet file will replace the information from the ID3 tags.
+  When you enable this option, you'll have to reboot for it to come into
+  effect.
+
 \end{description}