diff --git a/src/slurmd/smgr.c b/src/slurmd/smgr.c
index 9eba4c5d4ef0dac841e07bdfa796c8a4aaafb5f0..8db6bf70e3874830bf9c122cc28f67346bef3c90 100644
--- a/src/slurmd/smgr.c
+++ b/src/slurmd/smgr.c
@@ -342,6 +342,8 @@ _setup_env(slurmd_job_t *job, int taskid)
 	int cnt = (int) job->envc;
 	task_info_t *t = job->task[taskid];
 
+	if (setenvpf(&job->env, &cnt, "SLURM_JOBID=%d",  job->jobid)  < 0)
+		return -1;
 	if (setenvpf(&job->env, &cnt, "SLURM_NODEID=%d", job->nodeid) < 0)
 		return -1;
 	if (setenvpf(&job->env, &cnt, "SLURM_PROCID=%d", t->gid     ) < 0)