diff --git a/src/api/allocate.c b/src/api/allocate.c
index 83b86ede8abfd249ab73352d7894de56962fe796..49e75ea0753414a3f6f242cba822c87e898953e1 100644
--- a/src/api/allocate.c
+++ b/src/api/allocate.c
@@ -642,7 +642,7 @@ _accept_msg_connection(int listen_fd,
 	}
 
 	slurm_get_addr(&cli_addr, &port, host, sizeof(host));
-	debug2("got message connection from %s:%d", host, port);
+	debug2("got message connection from %s:%hu", host, port);
 
 	msg = xmalloc(sizeof(slurm_msg_t));
 	slurm_msg_t_init(msg);
diff --git a/src/api/step_launch.c b/src/api/step_launch.c
index 41029d8343f8b42869ff0111498931851033fea7..09d42c3cc84bfad2b9e9c7835cf77b1115015725 100644
--- a/src/api/step_launch.c
+++ b/src/api/step_launch.c
@@ -582,7 +582,7 @@ static int _message_socket_accept(eio_obj_t *obj, List objs)
 	   in /etc/hosts. */
 	uc = (unsigned char *)&((struct sockaddr_in *)&addr)->sin_addr.s_addr;
 	port = ((struct sockaddr_in *)&addr)->sin_port;
-	debug2("got message connection from %u.%u.%u.%u:%d",
+	debug2("got message connection from %u.%u.%u.%u:%hu",
 	       uc[0], uc[1], uc[2], uc[3], ntohs(port));
 	fflush(stdout);
 
diff --git a/src/salloc/msg.c b/src/salloc/msg.c
index b41fa5916041f2c03a83406633fbcde201eb612c..e81725811a509d895c0fe78b4fa061614e45cf1c 100644
--- a/src/salloc/msg.c
+++ b/src/salloc/msg.c
@@ -168,7 +168,7 @@ static int _message_socket_accept(eio_obj_t *obj, List objs)
 	   in /etc/hosts. */
 	uc = (unsigned char *)&((struct sockaddr_in *)&addr)->sin_addr.s_addr;
 	port = ((struct sockaddr_in *)&addr)->sin_port;
-	debug2("got message connection from %u.%u.%u.%u:%d",
+	debug2("got message connection from %u.%u.%u.%u:%hu",
 	       uc[0], uc[1], uc[2], uc[3], ntohs(port));
 	fflush(stdout);
 
diff --git a/src/sattach/sattach.c b/src/sattach/sattach.c
index 20d07aef9acaaac7551c7fae2428707d55b5c0e5..98fe02aaa162fbc224feaedf8e602a3b98f56f60 100644
--- a/src/sattach/sattach.c
+++ b/src/sattach/sattach.c
@@ -474,7 +474,7 @@ static int _message_socket_accept(eio_obj_t *obj, List objs)
 	   in /etc/hosts. */
 	uc = (unsigned char *)&((struct sockaddr_in *)&addr)->sin_addr.s_addr;
 	port = ((struct sockaddr_in *)&addr)->sin_port;
-	debug2("got message connection from %u.%u.%u.%u:%d",
+	debug2("got message connection from %u.%u.%u.%u:%hu",
 	       uc[0], uc[1], uc[2], uc[3], ntohs(port));
 	fflush(stdout);
 
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index ab66ae3aff471e63088e5adcc6fd415371526da7..0782e555820aef49912be35ceca10d38d4266add 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -280,7 +280,7 @@ _accept_msg_connection(slurm_fd slurmctld_fd,
 	}
 
 	slurm_get_addr(&cli_addr, &port, host, sizeof(host));
-	debug2("got message connection from %s:%d", host, port);
+	debug2("got message connection from %s:%hu", host, port);
 
 	msg = xmalloc(sizeof(slurm_msg_t));
 	slurm_msg_t_init(msg);
diff --git a/src/srun/msg.c b/src/srun/msg.c
index be20300738a882d79483381c1e8332f8b6c45ead..342a8aed64469fe14275a96ed1e8ce5bb5813fb4 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -999,7 +999,7 @@ _accept_msg_connection(srun_job_t *job, int fdnum)
 	   in /etc/hosts. */
 	uc = (unsigned char *)&cli_addr.sin_addr.s_addr;
 	port = cli_addr.sin_port;
-	debug2("got message connection from %u.%u.%u.%u:%d",
+	debug2("got message connection from %u.%u.%u.%u:%hu",
 	       uc[0], uc[1], uc[2], uc[3], ntohs(port));
 
 	msg = xmalloc(sizeof(slurm_msg_t));