diff --git a/DynareBison.yy b/DynareBison.yy
index e6fe81d915003c4bf2471a2b78f9cea80003995f..10bd29d3efba862c6411c7b5e782fb3274e697fe 100644
--- a/DynareBison.yy
+++ b/DynareBison.yy
@@ -160,7 +160,7 @@ class ParsingDriver;
 %token EXTERNAL_FUNCTION EXT_FUNC_NAME EXT_FUNC_NARGS FIRST_DERIV_PROVIDED SECOND_DERIV_PROVIDED
 %token SELECTED_VARIABLES_ONLY COVA_COMPUTE ESTIMATION_FILE_TAG SIMULATION_FILE_TAG
 %token ERROR_BANDS ERROR_BAND_PERCENTILES SHOCKS_PER_PARAMETER
-%token SHOCK_DRAWS FREE_PARAMETERS MEDIAN DATA_OBS_NBR
+%token SHOCK_DRAWS FREE_PARAMETERS MEDIAN DATA_OBS_NBR NEIGHBORHOOD_WIDTH
 %token FILTERED_PROBABILITIES FILTERED REAL_TIME_SMOOTHED
 %token PROPOSAL_TYPE MDD_PROPOSAL_DRAWS MDD_USE_MEAN_CENTER
 %token ADAPTIVE_MH_DRAWS THINNING_FACTOR COEFFICIENTS_PRIOR_HYPERPARAMETERS
@@ -1685,6 +1685,7 @@ dynare_sensitivity_option : o_gsa_identification
                           | o_gsa_namexo
                           | o_gsa_namlagendo
                           | o_gsa_var_rmse
+                          | o_gsa_neighborhood_width
                           | o_datafile
                           | o_nobs
                           | o_first_obs
@@ -1935,6 +1936,7 @@ o_gsa_sample_file : GSA_SAMPLE_FILE EQUAL INT_NUMBER
                   | GSA_SAMPLE_FILE EQUAL filename
                     { driver.option_str("gsa_sample_file", $3); }
                   ;
+o_gsa_neighborhood_width : NEIGHBORHOOD_WIDTH EQUAL non_negative_number { driver.option_num("neighborhood_width", $3); };
 o_load_ident_files : LOAD_IDENT_FILES EQUAL INT_NUMBER { driver.option_num("load_ident_files", $3); }
 o_useautocorr : USEAUTOCORR EQUAL INT_NUMBER { driver.option_num("useautocorr", $3); }
 o_prior_mc : PRIOR_MC EQUAL INT_NUMBER { driver.option_num("prior_mc", $3); }
diff --git a/DynareFlex.ll b/DynareFlex.ll
index dd988128a9d190494ee047e83aee604c871e5aed..c47f837399e8a025468d85e824916b7e9a42201b 100644
--- a/DynareFlex.ll
+++ b/DynareFlex.ll
@@ -551,6 +551,7 @@ string eofbuff;
 <DYNARE_STATEMENT>alpha2_rmse {return token::ALPHA2_RMSE;}
 <DYNARE_STATEMENT>load_ident_files {return token::LOAD_IDENT_FILES;}
 <DYNARE_STATEMENT>useautocorr {return token::USEAUTOCORR;}
+<DYNARE_STATEMENT>neighborhood_width {return token::NEIGHBORHOOD_WIDTH;}
  /* end of GSA options */
 
  /* For identification() statement */