diff --git a/apps/settings_list.c b/apps/settings_list.c
index fbdf356def..bb88786a2c 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1467,7 +1467,7 @@ const struct settings_list settings[] = {
                    "touchscreen mode", "point,grid", NULL, 2,
                    ID2P(LANG_TOUCHSCREEN_POINT), ID2P(LANG_TOUCHSCREEN_GRID)),
 #endif
-    OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent_skip", NULL),
+    OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent skip", NULL),
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 7f7e225007..0ddca7534f 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -128,7 +128,9 @@
     \opt{usb_charging}{
       usb charging  & on, off           & N/A\\
     }
-    skip length     & track, 1, 2, 3, 4, 5, 10, 15 & minutes\\
+    skip length     & track, 1s, 2s, 3s, 5s, 7s, 10s, 15s, 20s, 1min,
+            90s, 2min, 3min, 5min, 10min, 15min & N/A\\
+    prevent skip    & on, off           & N/A\\
     start in screen & previous, root, files, db, wps, menu,
       \opt{recording}{recording, }
       \opt{radio}{radio, }
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 2b3e0479d0..50240c35f7 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -259,12 +259,14 @@ you to configure settings related to audio playback.
   effect.
   
 \section{Skip Length}\index{Skip Length}
-  Designed to speed up navigation and prevent unintentional track skipping when
-  listening to long audio tracks, \setting{Skip Length} changes the behavior of
+  Designed to speed up navigation when listening to long audio tracks,
+  \setting{Skip Length} changes the behavior of
   the \ActionWpsSkipPrev{} and \ActionWpsSkipNext{} buttons so that they skip
-  by a given number of minutes instead of skipping to a new track.
+  by a given time instead of skipping to a new track.
 
-  \note{To skip tracks with this setting set to a time interval, press Short 
-    \ActionWpsSkipPrev{} + Long \ActionWpsSkipNext{} to go forward and Short 
-    \ActionWpsSkipNext{} + Long \ActionWpsSkipPrev{} to go back.}
+\section{Prevent Skipping}\index{Prevent Skipping}
+  If this option is enabled, the ability to manually skip tracks is disabled
+  in order to avoid accidental track skips. It does not prevent changing tracks
+  if a track ends, which can be achieved by combining this option with
+  \setting{Repeat} set to \setting{One}