diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a632de69c3..806847a5e6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* f-exp.y (f_parse): Set yydebug.
+
 2019-03-06  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* f-lang.c (evaluate_subexp_f): New function.
diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 5e980944b1..c223d366db 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -1211,6 +1211,8 @@ f_parse (struct parser_state *par_state)
 {
   /* Setting up the parser state.  */
   scoped_restore pstate_restore = make_scoped_restore (&pstate);
+  scoped_restore restore_yydebug = make_scoped_restore (&yydebug,
+							parser_debug);
   gdb_assert (par_state != NULL);
   pstate = par_state;