diff --git a/ComputingTasks.cc b/ComputingTasks.cc
index 51f48e2d42d5f6a669612bf7451d9ab49da07109..400630bbc0f4496bc6b1c3f1b238f0f027e2d7e0 100644
--- a/ComputingTasks.cc
+++ b/ComputingTasks.cc
@@ -4345,10 +4345,13 @@ void
 CalibSmootherStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
 {
   options_list.writeOutput(output);
+  OptionsList::string_options_t::const_iterator it = options_list.string_options.find("parameter_set");
+  if (it == options_list.string_options.end())
+    output << "options_.parameter_set = 'calibration';" << endl;
   symbol_list.writeOutput("var_list_", output);
   output << "options_.smoother = 1;" << endl
          << "options_.order = 1;" << endl
-         << "[oo_, M_, options_, bayestopt_] = evaluate_smoother('calibration', var_list_, M_, oo_, options_, bayestopt_, estim_params_);" << endl;
+         << "[oo_, M_, options_, bayestopt_] = evaluate_smoother(options_.parameter_set, var_list_, M_, oo_, options_, bayestopt_, estim_params_);" << endl;
 }
 
 void
diff --git a/DynareBison.yy b/DynareBison.yy
index 52931d891d629c100f8fb7fbc67e4b4a013a2334..0c1e6f2b1ac1e16ab3f995018eb4e0e455bc74f7 100644
--- a/DynareBison.yy
+++ b/DynareBison.yy
@@ -2700,6 +2700,7 @@ calib_smoother_option : o_filtered_vars
                       | o_diffuse_kalman_tol
                       | o_diffuse_filter
                       | o_smoothed_state_uncertainty
+                      | o_parameter_set
                       ;
 
 extended_path : EXTENDED_PATH ';'