diff --git a/orte/test/mpi/Makefile b/orte/test/mpi/Makefile
index b13cb44daa..bee70587eb 100644
--- a/orte/test/mpi/Makefile
+++ b/orte/test/mpi/Makefile
@@ -1,4 +1,4 @@
-PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spawn concurrent_spawn spawn_multiple mpi_spin delayed_abort loop_spawn loop_child bad_exit pubsub hello_barrier segv accept connect hello_output hello_show_help
+PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spawn concurrent_spawn spawn_multiple mpi_spin delayed_abort loop_spawn loop_child bad_exit pubsub hello_barrier segv accept connect hello_output hello_show_help mpi_after_finalize
 
 all: $(PROGS)
 
diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c
index 49a5727d09..5787324ffd 100644
--- a/orte/tools/orterun/orterun.c
+++ b/orte/tools/orterun/orterun.c
@@ -724,6 +724,9 @@ static void terminated(int trigpipe, short event, void *arg)
     
     orte_finalize();
     free(orterun_basename);
+    if (orte_debug_flag) {
+        fprintf(stderr, "orterun: exiting with status %d\n", orte_exit_status);
+    }
     exit(orte_exit_status);
 }