diff --git a/src/slurmctld/agent.h b/src/slurmctld/agent.h
index f005a051e63759d51275d45f00bab9698bcd37d8..d656616e4d984be7cdda339edbf1d7379222fd88 100644
--- a/src/slurmctld/agent.h
+++ b/src/slurmctld/agent.h
@@ -36,7 +36,8 @@
 					 * slurmctld, 0 for function call */
 #define AGENT_THREAD_COUNT	10	/* maximum active threads per agent */
 #define COMMAND_TIMEOUT 	10	/* command requeue or error, seconds */
-#define MAX_AGENT_CNT		 7	/* maximum simultaneous agents, note 
+#define MAX_AGENT_CNT		(MAX_SERVER_THREADS / (AGENT_THREAD_COUNT + 2))
+					/* maximum simultaneous agents, note 
 					 *   total thread count is product of
 					 *   MAX_AGENT_CNT and
 					 *   (AGENT_THREAD_COUNT + 2) */ 
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index 1f63b601facfdd8e94e3db731e47d0ee8c99636a..d5f2a9e4252271d948a84fca7371e093937be0b4 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -75,7 +75,7 @@
  *  GENERAL CONFIGURATION parameters and data structures
 \*****************************************************************************/
 /* Maximum parallel threads to service incoming RPCs */
-#define MAX_SERVER_THREADS 50
+#define MAX_SERVER_THREADS 60
 
 /* Perform full slurmctld's state every PERIODIC_CHECKPOINT seconds */
 #define	PERIODIC_CHECKPOINT	300