diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index ed4629b57cf0798e21fd4813a3cfecbebb91ed85..9a7b543e406fd07dc2e2b1a81747a1a66e79da59 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -937,6 +937,7 @@ typedef struct slurm_ctl_conf {
 	uint32_t next_job_id;	/* next slurm generated job_id to assign */
 	uint16_t fast_schedule;	/* 1 to *not* check configurations by node 
 				 * (only check configuration file, faster) */
+	uint16_t get_env_timeout; /* timeout for srun --get-user-env option */
 	uint16_t inactive_limit;/* seconds of inactivity before a
 				 * inactive resource allocation is released */
 	char *job_acct_gather_type; /* job accounting gather type */
@@ -957,7 +958,6 @@ typedef struct slurm_ctl_conf {
 	char *job_credential_private_key;	/* path to private key */
 	char *job_credential_public_certificate;/* path to public certificate*/
 	uint16_t job_file_append; /* if set, append to stdout/err file */
-	uint16_t get_env_timeout; /* secs allowed for srun --get-user-env */
 	uint16_t kill_wait;	/* seconds between SIGXCPU to SIGKILL 
 				 * on job termination */
 	char *mail_prog;	/* pathname of mail program */
diff --git a/src/api/config_info.c b/src/api/config_info.c
index 948c8a922729de122862fc7f1345bcb5de9bc1bc..5f625e785993b9c918ca1308abe08b956ed3c7dc 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -147,7 +147,9 @@ void slurm_print_ctl_conf ( FILE* out,
 	fprintf(out, "FastSchedule            = %u\n",
 		slurm_ctl_conf_ptr->fast_schedule);
 	fprintf(out, "FirstJobId              = %u\n",
-		 slurm_ctl_conf_ptr->first_job_id);
+		slurm_ctl_conf_ptr->first_job_id);
+	fprintf(out, "GetEnvTimeout           = %u\n",
+		slurm_ctl_conf_ptr->get_env_timeout);
 #ifdef HAVE_XCPU
 	fprintf(out, "HAVE_XCPU               = %d\n", HAVE_XCPU);
 #endif
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 6e5a9cf826dd1800b56901cce2b0c6aa9ad4142f..4ce27d6b70f1ea7063da2be54fe4ada17b8823f6 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -2215,6 +2215,8 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer)
 	pack16(build_ptr->fast_schedule, buffer);
 	pack32(build_ptr->first_job_id, buffer);
 
+	pack16(build_ptr->get_env_timeout, buffer);
+
 	pack16(build_ptr->inactive_limit, buffer);
 
 	pack16(build_ptr->job_acct_gather_freq, buffer);
@@ -2347,6 +2349,8 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
 	safe_unpack16(&build_ptr->fast_schedule, buffer);
 	safe_unpack32(&build_ptr->first_job_id, buffer);
 
+	safe_unpack16(&build_ptr->get_env_timeout, buffer);
+
 	safe_unpack16(&build_ptr->inactive_limit, buffer);
 
 	safe_unpack16(&build_ptr->job_acct_gather_freq, buffer);