diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 2908fe595a..20ec28b759 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -3345,6 +3345,7 @@ These settings will only take effect after %1 is restarted.\n\
PROGRAM_NAME));
add_option (_("Transport"), bo);
+
bo = new BoolOption (
"latched-record-enable",
_("Keep record-enable engaged on stop"),
@@ -3385,6 +3386,24 @@ These settings will only take effect after %1 is restarted.\n\
"that occurs when fast-forwarding or rewinding through some kinds of audio"));
add_option (_("Transport"), bo);
+
+ bo = new BoolOption (
+ "rewind-ffwd-like-tape-decks",
+ _("Rewind/Fast-forward like a tape deck"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_rewind_ffwd_like_tape_decks),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_rewind_ffwd_like_tape_decks)
+ );
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ string_compose (_("When enabled if %1 is not recording, it will stop the transport "
+ "when it reaches the current session end marker\n\n"
+ "When disabled %1 will continue to roll past the session end marker at all times"),
+ PROGRAM_NAME));
+ Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+ _("When enabled rewind/ffwd controls will immediately change playback direction when appropriate.\n\n "
+ "When disabled rewind/ffwd controls will gradually speed up/slow down playback"));
+ add_option (_("Transport"), bo);
+
+
ComboOption* psc = new ComboOption (
"preroll-seconds",
_("Preroll"),