2 files changed, 11 insertions, 2 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index 927dcc4104..b618b575e7 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -4,7 +4,12 @@
   you can return to it at a later time. Bookmarks are saved on a per directory
   basis (for dynamic playlists) or for individual (saved) playlists. They are 
   stored next to the directory/playlist they reference.
-  You can store multiple bookmarks for the same track.
+  You can store multiple bookmarks for the same track.\\*
+  
+  \note{Bookmarking only works when tracks are launched from the file browser,
+        and does not currently work for tracks launched via the
+        database.\\*}
+
   \begin{description}
   \item [Bookmark on Stop.] This option controls whether Rockbox writes a
     bookmark to the disk when playback is stopped. Setting this to
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index dfd74837df..fea1081c5e 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -46,7 +46,11 @@ safely (see \reference{ref:Safeshutdown}).
 {The list bookmarks screen}{}
 If the \setting{Save a list of recently created bookmarks} option is enabled 
 then you can view a list of several recent bookmarks here and select one to 
-jump straight to that track.
+jump straight to that track.\\*
+
+ \note{Bookmarking only works when tracks are launched from the file browser,
+        and does not currently work for tracks launched via the
+        database.\\*}
 
 \begin{table}
   \begin{btnmap}{}{}