diff --git a/src/Context.cpp b/src/Context.cpp
index 40bc31388..1f59ab699 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -459,6 +459,13 @@ int Context::dispatch (std::string &out)
       cli2.prepareFilter ();
     }
 
+    // With rc.debug.parser == 3, there are more tree dumps than you might want,
+    // but we need the rc.debug.parser == 1 case covered also, with the final
+    // tree.
+    if (config.getBoolean ("debug") &&
+        config.getInteger ("debug.parser") == 1)
+      debug (cli2.dump ("Parse Tree"));
+
     return c->execute (out);
   }