diff --git a/NEWS b/NEWS
index 6934cd1c596ad352bc27ca45a0eb5b2c49892705..742affdabfa2c83a31e3d0ed27f46e926bb5e72d 100644
--- a/NEWS
+++ b/NEWS
@@ -370,6 +370,7 @@ documents those changes that are of interest to users and administrators.
  -- Fix a bug in the controller which display jobs in CF state as RUNNING.
  -- Preserve advanced _core_ reservation when nodes added/removed/resized on
     slurmctld restart. Rebuild core_bitmap as needed.
+ -- Fix for non-standard Munge port location for srun/pmi use.
 
 * Changes in Slurm 14.11.8
 ==========================
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 02b43bf7c8a32d8d319abbfd056797abcd0e1be5..85657fac8e5dfa3343107d952dfe63bb3b7b47cf 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -1538,7 +1538,6 @@ char *slurm_get_accounting_storage_pass(void)
 /* slurm_get_auth_info
  * returns the auth_info from slurmctld_conf object (AuthInfo parameter)
  * cache value in local buffer for best performance
- * RET char *    - auth info,  MUST be xfreed by caller
  */
 extern char *slurm_get_auth_info(void)
 {
diff --git a/src/common/slurm_protocol_api.h b/src/common/slurm_protocol_api.h
index 0a41e6d3fa6fcadd19a406ce58e4fee82f334343..adca23631be4d466257a189e2a3a88f83c08c780 100644
--- a/src/common/slurm_protocol_api.h
+++ b/src/common/slurm_protocol_api.h
@@ -92,7 +92,6 @@ enum {
 /* slurm_get_auth_info
  * returns the auth_info from slurmctld_conf object (AuthInfo parameter)
  * cache value in local buffer for best performance
- * RET char *    - auth info,  MUST be xfreed by caller
  */
 char *slurm_get_auth_info(void);
 
diff --git a/src/common/stepd_api.c b/src/common/stepd_api.c
index 74a23bfbc3a0c68f97c763149e21f7d894097b90..fbab6309872da9a86b4c0f270d0f4e7ea3751133 100644
--- a/src/common/stepd_api.c
+++ b/src/common/stepd_api.c
@@ -242,7 +242,7 @@ stepd_connect(const char *directory, const char *nodename,
 
 	buffer = init_buf(0);
 	/* Create an auth credential */
-	auth_cred = g_slurm_auth_create(NULL, 2, NULL);
+	auth_cred = g_slurm_auth_create(NULL, 2, slurm_get_auth_info());
 	if (auth_cred == NULL) {
 		error("Creating authentication credential: %s",
 		      g_slurm_auth_errstr(g_slurm_auth_errno(NULL)));
diff --git a/src/plugins/mpi/pmi2/spawn.c b/src/plugins/mpi/pmi2/spawn.c
index 079915ee8eb01eff9c5c89a3ca703e11e0f1fe12..099878700ec9ec0a027cc3eb9dbaf712a45c4255 100644
--- a/src/plugins/mpi/pmi2/spawn.c
+++ b/src/plugins/mpi/pmi2/spawn.c
@@ -154,7 +154,7 @@ spawn_req_pack(spawn_req_t *req, Buf buf)
 	spawn_subcmd_t *subcmd;
 	void *auth_cred;
 
-	auth_cred = g_slurm_auth_create(NULL, 2, NULL);
+	auth_cred = g_slurm_auth_create(NULL, 2, slurm_get_auth_info());
 	if (auth_cred == NULL) {
 		error("authentication: %s",
 		      g_slurm_auth_errstr(g_slurm_auth_errno(NULL)) );