diff --git a/data/locale/english.locale b/data/locale/english.locale
index 56a54d1f3..fe7584a9a 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1792,6 +1792,8 @@ videomenu.analog_sd_rgb_cinch RGB on cinch (SD)
 videomenu.analog_sd_rgb_scart RGB on scart (SD)
 videomenu.analog_sd_yprpb_cinch YPbPr on cinch (SD)
 videomenu.analog_sd_yprpb_scart YPbPr on scart (SD)
+videomenu.analog_auto AUTO
+videomenu.analog_cvbs CVBS
 videomenu.analog_hd_rgb RGB (HD)
 videomenu.analog_hd_yprpb YPbPr(HD)
 videomenu.analog_sd_rgb RGB (SD)
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index f2aa163b9..48d4ed339 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -118,13 +118,15 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VID
 	{ ANALOG_MODE(CINCH,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
 };
 
-#define VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT 4
+#define VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT 6
 const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TANK_OPTIONS[VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT] =
 {
-	{ ANALOG_MODE(BOTH ,SD,RGB  ), LOCALE_VIDEOMENU_ANALOG_SD_RGB   }, /* Scart and Cinch */
-	{ ANALOG_MODE(BOTH ,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB }, /*                 */
-	{ ANALOG_MODE(BOTH ,HD,RGB  ), LOCALE_VIDEOMENU_ANALOG_HD_RGB   }, /*                 */
-	{ ANALOG_MODE(BOTH ,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB }, /*                 */
+	{ ANALOG_MODE(BOTH ,xD,AUTO  ),LOCALE_VIDEOMENU_ANALOG_AUTO     }, /* Encoder automatically adjusts based on content   */
+	{ ANALOG_MODE(BOTH ,xD,CVBS  ),LOCALE_VIDEOMENU_ANALOG_CVBS     }, /* CVBS on SCART (disables fastblank, un-used dacs) */
+	{ ANALOG_MODE(BOTH ,SD,RGB  ), LOCALE_VIDEOMENU_ANALOG_SD_RGB   }, /* SD RGB on Cinch and SCART                        */
+	{ ANALOG_MODE(BOTH ,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB }, /* SD YPrPb on Cinch and SCART                      */
+	{ ANALOG_MODE(BOTH ,HD,RGB  ), LOCALE_VIDEOMENU_ANALOG_HD_RGB   }, /* HD RGB on Cinch and SCART                        */
+	{ ANALOG_MODE(BOTH ,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB }, /* HD YPrPb on Cinch and SCART                      */
 };
 
 #define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT 4
@@ -230,8 +232,8 @@ int CVideoSettings::showVideoSetup()
 	}
 	else if (system_rev > 0x06)
 	{
-		if (system_rev == 9) {
 #ifdef ANALOG_MODE
+		if (system_rev == 9 || system_rev == 11) { // Tank, Trinity.
 			vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TANK_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT, true, this);
 			vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE);
 #endif
diff --git a/src/system/locals.h b/src/system/locals.h
index 0d9a87465..5c96fe010 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1819,6 +1819,8 @@ typedef enum
 	LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART,
 	LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH,
 	LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART,
+	LOCALE_VIDEOMENU_ANALOG_AUTO,
+	LOCALE_VIDEOMENU_ANALOG_CVBS,
 	LOCALE_VIDEOMENU_ANALOG_HD_RGB,
 	LOCALE_VIDEOMENU_ANALOG_HD_YPRPB,
 	LOCALE_VIDEOMENU_ANALOG_SD_RGB,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 8f5b1fa76..bb507003b 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1819,6 +1819,8 @@ const char * locale_real_names[] =
 	"videomenu.analog_sd_rgb_scart",
 	"videomenu.analog_sd_yprpb_cinch",
 	"videomenu.analog_sd_yprpb_scart",
+	"videomenu.analog_auto",
+	"videomenu.analog_cvbs",
 	"videomenu.analog_hd_rgb",
 	"videomenu.analog_hd_yprpb",
 	"videomenu.analog_sd_rgb",