diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index ef243af5c3587873299c338e69b11bb22c08df3b..1e61487973d868d832e50f530c1de748fe5434da 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -558,7 +558,7 @@ size_t slurm_write_stream(slurm_fd open_fd, char *buffer, size_t size)
 {
         return _slurm_send_timeout(open_fd, buffer, size,
                                    SLURM_PROTOCOL_NO_SEND_RECV_FLAGS,
-                                   SLURM_MESSGE_TIMEOUT_MSEC_STATIC);
+                                   SLURM_MESSAGE_TIMEOUT_MSEC_STATIC);
 }
 size_t slurm_write_stream_timeout(slurm_fd open_fd, char *buffer,
                                   size_t size, int timeout)
@@ -580,7 +580,7 @@ size_t slurm_read_stream(slurm_fd open_fd, char *buffer, size_t size)
 {
         return _slurm_recv_timeout(open_fd, buffer, size,
                                    SLURM_PROTOCOL_NO_SEND_RECV_FLAGS,
-                                   SLURM_MESSGE_TIMEOUT_MSEC_STATIC);
+                                   SLURM_MESSAGE_TIMEOUT_MSEC_STATIC);
 }
 size_t slurm_read_stream_timeout(slurm_fd open_fd, char *buffer,
                                  size_t size, int timeout)
diff --git a/src/common/slurm_protocol_interface.h b/src/common/slurm_protocol_interface.h
index 0571ad4e90056ff6918818e8e0b472047dfc817b..b5c9c9a4a1c5adf74af5b3c979e7b2238fcb7eee 100644
--- a/src/common/slurm_protocol_interface.h
+++ b/src/common/slurm_protocol_interface.h
@@ -64,7 +64,7 @@
 #include "src/common/pack.h"
 #include "src/common/slurm_protocol_common.h"
 
-#define SLURM_MESSGE_TIMEOUT_MSEC_STATIC 2000
+#define SLURM_MESSAGE_TIMEOUT_MSEC_STATIC 5000
 
 /****************\
  **  Data Types  **
diff --git a/src/common/slurm_protocol_socket_implementation.c b/src/common/slurm_protocol_socket_implementation.c
index dede1b66d4e0f5978fb1b81ef52add2112e8d599..059ccc8e6c1a6192dc0d6aa2379693fc2d11848b 100644
--- a/src/common/slurm_protocol_socket_implementation.c
+++ b/src/common/slurm_protocol_socket_implementation.c
@@ -43,6 +43,7 @@
 #include <stdarg.h>
 #include <arpa/inet.h>
 #include <sys/param.h>
+#include <stdlib.h>
 
 #if HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
@@ -111,7 +112,7 @@ ssize_t _slurm_msg_recvfrom(slurm_fd fd, char **pbuf, size_t *lenp,
                             uint32_t flags)
 {
         return _slurm_msg_recvfrom_timeout(fd, pbuf, lenp, flags, 
-                                           SLURM_MESSGE_TIMEOUT_MSEC_STATIC);
+                                           SLURM_MESSAGE_TIMEOUT_MSEC_STATIC);
 }
 
 ssize_t _slurm_msg_recvfrom_timeout(slurm_fd fd, char **pbuf, size_t *lenp, 
@@ -151,7 +152,7 @@ ssize_t _slurm_msg_sendto(slurm_fd fd, char *buffer, size_t size,
                           uint32_t flags)
 {
         return _slurm_msg_sendto_timeout( fd, buffer, size, flags, 
-                                          SLURM_MESSGE_TIMEOUT_MSEC_STATIC);
+                                          SLURM_MESSAGE_TIMEOUT_MSEC_STATIC);
 }
 
 ssize_t _slurm_msg_sendto_timeout(slurm_fd fd, char *buffer, size_t size,