Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 17986)
+++ apps/lang/english.lang	(working copy)
@@ -1606,10 +1606,10 @@
   desc: in settings_menu
   user:
   <source>
-    *: "FF/RW Min Step"
+    *: "FF/RW Minimum Step"
   </source>
   <dest>
-    *: "FF/RW Min Step"
+    *: "FF/RW Minimum Step"
   </dest>
   <voice>
     *: "Minimum Step"
@@ -1620,10 +1620,10 @@
   desc: in settings_menu
   user:
   <source>
-    *: "FF/RW Accel"
+    *: "FF/RW Acceleration"
   </source>
   <dest>
-    *: "FF/RW Accel"
+    *: "FF/RW Acceleration"
   </dest>
   <voice>
     *: "Acceleration"
@@ -1651,10 +1651,10 @@
   desc: options menu to set fade on stop or pause
   user:
   <source>
-    *: "Fade on Stop/Pause"
+    *: "Fade On Stop/Pause"
   </source>
   <dest>
-    *: "Fade on Stop/Pause"
+    *: "Fade On Stop/Pause"
   </dest>
   <voice>
     *: "Fade On Stop and Pause"
@@ -1731,15 +1731,15 @@
   user:
   <source>
     *: none
-    swcodec: "Shuffle and Track Skip"
+    swcodec: "Shuffle And Track Skip"
   </source>
   <dest>
     *: none
-    swcodec: "Shuffle and Track Skip"
+    swcodec: "Shuffle And Track Skip"
   </dest>
   <voice>
     *: none
-    swcodec: "Shuffle and Track Skip"
+    swcodec: "Shuffle And Track Skip"
   </voice>
 </phrase>
 <phrase>
@@ -1936,13 +1936,13 @@
   desc: use track gain if shuffle mode is on, album gain otherwise
   user:
   <source>
-    *: "Track Gain if Shuffling"
+    *: "Track Gain If Shuffling"
   </source>
   <dest>
-    *: "Track Gain if Shuffling"
+    *: "Track Gain If Shuffling"
   </dest>
   <voice>
-    *: "Track Gain if Shuffling"
+    *: "Track Gain If Shuffling"
   </voice>
 </phrase>
 <phrase>
@@ -2147,15 +2147,15 @@
   user:
   <source>
     *: none
-    headphone_detection: "Pause on Headphone Unplug"
+    headphone_detection: "Pause On Headphone Unplug"
   </source>
   <dest>
     *: none
-    headphone_detection: "Pause on Headphone Unplug"
+    headphone_detection: "Pause On Headphone Unplug"
   </dest>
   <voice>
     *: none
-    headphone_detection: "Pause on Headphone Unplug"
+    headphone_detection: "Pause On Headphone Unplug"
   </voice>
 </phrase>
 <phrase>
@@ -2164,15 +2164,15 @@
   user:
   <source>
     *: none
-    headphone_detection: "Pause and Resume"
+    headphone_detection: "Pause And Resume"
   </source>
   <dest>
     *: none
-    headphone_detection: "Pause and Resume"
+    headphone_detection: "Pause And Resume"
   </dest>
   <voice>
     *: none
-    headphone_detection: "Pause and Resume"
+    headphone_detection: "Pause And Resume"
   </voice>
 </phrase>
 <phrase>
@@ -2181,15 +2181,15 @@
   user:
   <source>
     *: none
-    headphone_detection: "Duration to Rewind"
+    headphone_detection: "Duration To Rewind"
   </source>
   <dest>
     *: none
-    headphone_detection: "Duration to Rewind"
+    headphone_detection: "Duration To Rewind"
   </dest>
   <voice>
     *: none
-    headphone_detection: "Duration to Rewind"
+    headphone_detection: "Duration To Rewind"
   </voice>
 </phrase>
 <phrase>
@@ -2198,15 +2198,15 @@
   user:
   <source>
     *: none
-    headphone_detection: "Disable resume on startup if phones unplugged"
+    headphone_detection: "Disable Resume On Startup If Phones Unplugged"
   </source>
   <dest>
     *: none
-    headphone_detection: "Disable resume on startup if phones unplugged"
+    headphone_detection: "Disable Resume On Startup If Phones Unplugged"
   </dest>
   <voice>
     *: none
-    headphone_detection: "Disable resume on startup if phones unplugged"
+    headphone_detection: "Disable Resume On Startup If Phones Unplugged"
   </voice>
 </phrase>
 <phrase>
@@ -2248,7 +2248,7 @@
     *: "Sort Directories"
   </dest>
   <voice>
-    *: "sort directories"
+    *: "Sort Directories"
   </voice>
 </phrase>
 <phrase>
@@ -2262,7 +2262,7 @@
     *: "Sort Files"
   </dest>
   <voice>
-    *: "sort files"
+    *: "Sort Files"
   </voice>
 </phrase>
 <phrase>
@@ -11755,13 +11755,13 @@
   desc: in settings_menu
   user:
   <source>
-    *: "Very slow"
+    *: "Very Slow"
   </source>
   <dest>
-    *: "Very slow"
+    *: "Very Slow"
   </dest>
   <voice>
-    *: "Very slow"
+    *: "Very Slow"
   </voice>
 </phrase>
 <phrase>
@@ -11783,13 +11783,13 @@
   desc: in settings_menu
   user:
   <source>
-    *: "Very fast"
+    *: "Very Fast"
   </source>
   <dest>
-    *: "Very fast"
+    *: "Very Fast"
   </dest>
   <voice>
-    *: "Very fast"
+    *: "Very Fast"
   </voice>
 </phrase>
 <phrase>
@@ -11806,3 +11806,17 @@
     *: "Fast"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_FFRW_LIMIT
+  desc: in settings_menu
+  user:
+  <source>
+    *: "FF/RW Speed Limit"
+  </source>
+  <dest>
+    *: "FF/RW Speed Limit"
+  </dest>
+  <voice>
+    *: "Speed Limit"
+  </voice>
+</phrase>
Index: apps/gui/gwps-common.c
===================================================================
--- apps/gui/gwps-common.c	(revision 17986)
+++ apps/gui/gwps-common.c	(working copy)
@@ -231,10 +231,9 @@
                         max_step = (wps_state.id3->elapsed + ff_rewind_count) *
                                     FF_REWIND_MAX_PERCENT / 100;
                     }
-
                     max_step = MAX(max_step, MIN_FF_REWIND_STEP);
 
-                    if (step > max_step)
+                    if (step > max_step && global_settings.ff_rewind_limit)
                         step = max_step;
 
                     ff_rewind_count += step * direction;
Index: apps/settings.h
===================================================================
--- apps/settings.h	(revision 17986)
+++ apps/settings.h	(working copy)
@@ -448,6 +448,7 @@
     bool play_selected; /* Plays selected file even in shuffle mode */
     int ff_rewind_min_step; /* FF/Rewind minimum step size */
     int ff_rewind_accel; /* FF/Rewind acceleration (in seconds per doubling) */
+    bool ff_rewind_limit; /* FF/Rewind: whether to limit step at track ends */
 
 #ifndef HAVE_FLASH_STORAGE
     int disk_spindown; /* time until disk spindown, in seconds (0=off) */
Index: apps/menus/playback_menu.c
===================================================================
--- apps/menus/playback_menu.c	(revision 17986)
+++ apps/menus/playback_menu.c	(working copy)
@@ -64,10 +64,11 @@
 MENUITEM_SETTING(repeat_mode, &global_settings.repeat_mode, playback_callback);
 MENUITEM_SETTING(play_selected, &global_settings.play_selected, NULL);
 
+MENUITEM_SETTING(ff_rewind_limit, &global_settings.ff_rewind_limit, NULL);
 MENUITEM_SETTING(ff_rewind_accel, &global_settings.ff_rewind_accel, NULL);
 MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL);
 MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON,
-          &ff_rewind_min_step, &ff_rewind_accel);
+          &ff_rewind_min_step, &ff_rewind_accel, &ff_rewind_limit);
 #ifndef HAVE_FLASH_STORAGE
 #if CONFIG_CODEC == SWCODEC
 static int buffermargin_callback(int action,const struct menu_item_ex *this_item)
Index: apps/settings_list.c
===================================================================
--- apps/settings_list.c	(revision 17986)
+++ apps/settings_list.c	(working copy)
@@ -674,6 +674,7 @@
                    "seek acceleration", "very fast,fast,normal,slow,very slow", NULL, 5,
                    ID2P(LANG_VERY_FAST), ID2P(LANG_FAST), ID2P(LANG_NORMAL),
                    ID2P(LANG_SLOW) , ID2P(LANG_VERY_SLOW)),
+    OFFON_SETTING(0,ff_rewind_limit,LANG_FFRW_LIMIT,true,"seek speed limit",NULL),
 #if (CONFIG_CODEC == SWCODEC) && !defined(HAVE_FLASH_STORAGE)
     STRINGCHOICE_SETTING(0, buffer_margin, LANG_MP3BUFFER_MARGIN, 0,"antiskip",
                          "5s,15s,30s,1min,2min,3min,5min,10min", NULL, 8,