--- a/src/input.cc
+++ b/src/input.cc
@@ -60,6 +60,7 @@
 #include "pathlen.h"
 #include "pt.h"
 #include "pt-const.h"
+#include "pt-stmt.h"
 #include "sighandlers.h"
 #include "symtab.h"
 #include "sysdep.h"
@@ -553,6 +554,21 @@
 	  else if (match_sans_spaces ("dbg_step", input_buf))
 	    {
 	      tree::break_next = true;
+
+	      tree::last_line = 0;
+
+	      tree::break_function = curr_function;
+
+	      return retval;
+	    }
+	  else if (match_sans_spaces ("dbg_next", input_buf))
+	    {
+	      tree::break_next = true;
+
+	      tree::last_line = curr_statement->line ();
+
+	      tree::break_function = curr_function;
+
 	      return retval;
 	    }
 	}