diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 791d847b48..27bde598ad 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1381,6 +1381,12 @@ ARDOUR_UI::update_format ()
 	case RF64:
 		s << _("RF64");
 		break;
+	case RF64_WAV:
+		s << _("RF64/WAV");
+		break;
+	case MBWF:
+		s << _("MBWF");
+		break;
 	}
 
 	s << " ";
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index d3f6aa2c7f..e07ecbdca7 100644
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -179,10 +179,17 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 		sigc::mem_fun (*_session_config, &SessionConfiguration::set_native_file_header_format)
 		);
 
-	hf->add (BWF, _("Broadcast WAVE"));
-	hf->add (WAVE, _("WAVE"));
+	hf->add (BWF, _("Broadcast WAVE (4GB size limit)"));
+#ifdef HAVE_RF64_RIFF
+	hf->add (MBWF, _("Broadcast RF64"));
+#endif	
+	hf->add (WAVE, _("WAVE (4GB size limit)"));
 	hf->add (WAVE64, _("WAVE-64"));
 	hf->add (CAF, _("CAF"));
+	hf->add (RF64, _("RF64"));
+#ifdef HAVE_RF64_RIFF
+	hf->add (RF64_WAV, _("RF64 (WAV compatible)"));
+#endif
 
 	add_option (_("Media"), hf);