diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index 786951656e21cda91631664918871402fe1fd320..b21bc6f169b3a838684ba8207b76d04041b52946 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -592,8 +592,11 @@ create_job_step(srun_job_t *job)
 	slurm_step_ctx_params_t_init(&job->ctx_params);
 	job->ctx_params.job_id = job->jobid;
 	job->ctx_params.uid = opt.uid;
-/* 	totalview_jobid = NULL; */
-/* 	xstrfmtcat(totalview_jobid, "%u", ctx_params.job_id); */
+
+	/* set the jobid for totalview */
+	totalview_jobid = NULL;
+	xstrfmtcat(totalview_jobid, "%u", job->ctx_params.job_id);
+
 	job->ctx_params.node_count = job->nhosts;
 	job->ctx_params.task_count = opt.nprocs;
 	
diff --git a/src/srun/debugger.c b/src/srun/debugger.c
index 49ecfbf393608f028fb168b3f13ee21049b44941..f968c0c951f76df975e9e700f9fd1bffdd9a5e03 100644
--- a/src/srun/debugger.c
+++ b/src/srun/debugger.c
@@ -16,7 +16,7 @@
  *  any later version.
  *
  *  In addition, as a special exception, the copyright holders give permission 
- *  to link the code of portions of this program with the OpenSSL library under 
+ *  to link the code of portions of this program with the OpenSSL library under
  *  certain conditions as described in each individual source file, and 
  *  distribute linked combinations including the two. You must obey the GNU 
  *  General Public License in all respects for all of the code used other than