diff --git a/libs/ardour/ardour/export_format_manager.h b/libs/ardour/ardour/export_format_manager.h
index eaa41e8604..1907358bbe 100644
--- a/libs/ardour/ardour/export_format_manager.h
+++ b/libs/ardour/ardour/export_format_manager.h
@@ -117,6 +117,9 @@ class LIBARDOUR_API ExportFormatManager : public PBD::ScopedConnectionList
 	void select_normalize_lufs (float value);
 	void select_normalize_dbtp (float value);
 	void select_tagging (bool tag);
+	void select_demo_noise_level (float value);
+	void select_demo_noise_duration (int value);
+	void select_demo_noise_interval (int value);
 
   private:
 
diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc
index 56f03c297e..4d76c8ca22 100644
--- a/libs/ardour/export_format_manager.cc
+++ b/libs/ardour/export_format_manager.cc
@@ -387,6 +387,27 @@ ExportFormatManager::select_normalize_dbtp (float value)
 	check_for_description_change ();
 }
 
+void
+ExportFormatManager::select_demo_noise_level (float value)
+{
+	current_selection->set_demo_noise_level (value);
+	check_for_description_change ();
+}
+
+void
+ExportFormatManager::select_demo_noise_duration (int value)
+{
+	current_selection->set_demo_noise_duration (value);
+	check_for_description_change ();
+}
+
+void
+ExportFormatManager::select_demo_noise_interval (int value)
+{
+	current_selection->set_demo_noise_interval (value);
+	check_for_description_change ();
+}
+
 void
 ExportFormatManager::select_tagging (bool tag)
 {
diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc
index 5aca68245b..52f538c920 100644
--- a/libs/ardour/export_format_specification.cc
+++ b/libs/ardour/export_format_specification.cc
@@ -677,8 +677,8 @@ ExportFormatSpecification::description (bool include_name)
 		components.push_back ("CUE");
 	}
 
-	if (_with_mp4chaps) {
-		components.push_back ("MP4ch");
+	if (_demo_noise_duration > 0 && _demo_noise_interval > 0) {
+		components.push_back ("Demo-Noise");
 	}
 
 	if (!_command.empty()) {
diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index 45adce1982..7a203fc069 100644
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -459,8 +459,8 @@ ExportGraphBuilder::SFC::SFC (ExportGraphBuilder &parent, FileSpec const & new_c
 		samplecnt_t sample_rate = parent.session.nominal_sample_rate();
 		demo_noise_adder.reset (new DemoNoiseAdder (channels));
 		demo_noise_adder->init (max_samples,
-				sample_rate * config.format->demo_noise_interval (),
-				sample_rate * config.format->demo_noise_duration (),
+				sample_rate * config.format->demo_noise_interval () / 1000,
+				sample_rate * config.format->demo_noise_duration () / 1000,
 				config.format->demo_noise_level ());
 		if (intermediate) { intermediate->add_output (demo_noise_adder); }
 		intermediate = demo_noise_adder;