diff --git a/doc/manual/source/the-model-file.rst b/doc/manual/source/the-model-file.rst
index 99bd927f5..b922f3429 100644
--- a/doc/manual/source/the-model-file.rst
+++ b/doc/manual/source/the-model-file.rst
@@ -6977,6 +6977,11 @@ Shock Decomposition
         ``1``, the shock decomposition is computed conditional on the
         smoothed state variables in period 1. Default: ``0``.
 
+    .. option:: with_epilogue
+
+        If set, then also compute the decomposition for variables declared in
+        the ``epilogue`` block.
+
     *Output*
 
     .. matvar:: oo_.shock_decomposition
@@ -7134,6 +7139,11 @@ Shock Decomposition
         integer defines the last observation (equivalent to
         :opt:`nobs`). Default: not enabled.
 
+    .. option:: with_epilogue
+
+        If set, then also compute the decomposition for variables declared in
+        the ``epilogue`` block.
+
     *Output*
 
     .. matvar:: oo_.realtime_shock_decomposition
@@ -7376,6 +7386,11 @@ Shock Decomposition
         Maximum number of rows in the subplot layout of detailed shock
         decomposition graphs. Note that columns are always 3. Default: 6
 
+    .. option:: with_epilogue
+
+        If set, then also compute the decomposition for variables declared in
+        the ``epilogue`` block.
+
 .. command:: initial_condition_decomposition [VARIABLE_NAME]...;
              initial_condition_decomposition (OPTIONS...) [VARIABLE_NAME]...;
 
diff --git a/preprocessor b/preprocessor
index 8baec1e0e..5f451ebc9 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit 8baec1e0ec5e06df5e14a96467fe520f5eb6f374
+Subproject commit 5f451ebc9937b0a2a99f927a3f27fc2911b64eb9
diff --git a/tests/shock_decomposition/ls2003_plot.mod b/tests/shock_decomposition/ls2003_plot.mod
index af0a05ff8..27bdab3f1 100644
--- a/tests/shock_decomposition/ls2003_plot.mod
+++ b/tests/shock_decomposition/ls2003_plot.mod
@@ -90,11 +90,9 @@ A e_A;
 end;
 
 options_.initial_date=dates('1989Q4'); % date arbitrarily set for testing purposes
-options_.shock_decomp.with_epilogue=true;
-shock_decomposition(nograph);
+shock_decomposition(nograph, with_epilogue);
 // test for nothing to squeeze
 squeeze_shock_decomposition;
-// oo_ = squeeze_shock_decomp(M_,oo_,options_);
 
 // standard plot
 plot_shock_decomposition y_obs R_obs pie_obs dq de;
@@ -122,7 +120,6 @@ realtime_shock_decomposition(forecast=8, save_realtime=[5 9 13 17 21 25 29 33 37
 
 // test squeeze
 squeeze_shock_decomposition;
-// oo_ = squeeze_shock_decomp(M_,oo_,options_);
 
 //realtime pooled
 plot_shock_decomposition(realtime = 1) y_obs R_obs pie_obs dq de;
@@ -167,7 +164,6 @@ realtime_shock_decomposition(fast_realtime=75) y_obs R_obs pie_obs dq de;
 
 // re-test squeeze
 squeeze_shock_decomposition;
-// oo_ = squeeze_shock_decomp(M_,oo_,options_);
 
 collect_latex_files;
 if system(['pdflatex -halt-on-error -interaction=batchmode ' M_.fname '_TeX_binder.tex'])