diff --git a/NEWS b/NEWS
index 93271a2798b810ffddf1ad91614c7536ab40e61a..4a46f925e377c9caf1501518864b4c3db53ae29c 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,8 @@ documents those changes that are of interest to users and admins.
     expression rather than one line per node. Frequency of log messages is 
     dependent upon SlurmctldDebug value from 300 seconds at SlurmctldDebug<=3
     to 1 second at SlurmctldDebug>=5.
+ -- If a DOWN node is resumed, set its state to IDLE & NOT_RESPONDING and 
+    ping the node immediately to clear the NOT_RESPONDING flag.
  
 * Changes in SLURM 1.3.6
 ========================
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index c001feaeb49657200fb01bd8032d2fbb04c1458f..335eb978859a5e48c49b1d5430cedd6a95410f6c 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -143,6 +143,7 @@ int bg_recover = DEFAULT_RECOVER;
 char *slurmctld_cluster_name = NULL; /* name of cluster */
 void *acct_db_conn = NULL;
 int accounting_enforce = 0;
+bool ping_nodes_now = false;
 
 /* Local variables */
 static int	daemonize = DEFAULT_DAEMONIZE;
@@ -1097,12 +1098,13 @@ static void *_slurmctld_background(void *no_data)
 				unlock_slurmctld(node_write_lock);
 			}
 		}
-
-		if (difftime(now, last_ping_node_time) >= ping_interval) {
+		if ((difftime(now, last_ping_node_time) >= ping_interval) ||
+		    ping_nodes_now) {
 			static bool msg_sent = false;
 			if (is_ping_done()) {
 				msg_sent = false;
 				last_ping_node_time = now;
+				ping_nodes_now = false;
 				lock_slurmctld(node_write_lock);
 				ping_nodes();
 				unlock_slurmctld(node_write_lock);
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index 7283b0f0a9fa114fa4edb48b657a3d4b30257c22..bd523c833806c8cd40586d21c79329fa70cf3816 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -1067,9 +1067,13 @@ int update_node ( update_node_msg_t * update_node_msg )
 				node_ptr->node_state &= (~NODE_STATE_DRAIN);
 				node_ptr->node_state &= (~NODE_STATE_FAIL);
 				base_state &= NODE_STATE_BASE;
-				if (base_state == NODE_STATE_DOWN)
+				if (base_state == NODE_STATE_DOWN) {
 					state_val = NODE_STATE_IDLE;
-				else
+					node_ptr->node_state |= 
+							NODE_STATE_NO_RESPOND;
+					node_ptr->last_response = now;
+					ping_nodes_now = true;
+				} else
 					state_val = base_state;
 			}
 			if (state_val == NODE_STATE_DOWN) {
diff --git a/src/slurmctld/ping_nodes.c b/src/slurmctld/ping_nodes.c
index fbbd8d863107aa22a3cce9ed7054a413753300fc..1317f9ae1538ffb502d4962dcd819ecc11085eaa 100644
--- a/src/slurmctld/ping_nodes.c
+++ b/src/slurmctld/ping_nodes.c
@@ -217,7 +217,8 @@ void ping_nodes (void)
 			continue;
 		}
 
-		if (node_ptr->last_response >= still_live_time)
+		if ((!no_resp_flag) && 
+		    (node_ptr->last_response >= still_live_time))
 			continue;
 
 		/* Do not keep pinging down nodes since this can induce
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index beea2391f5b6b7b4df460e568aa406790b249e29..96268279ba3944a16fbd56f12192383590fa2c85 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -237,6 +237,7 @@ extern uint32_t total_cpus;		/* count of CPUs in the entire cluster */
 extern bitstr_t *idle_node_bitmap;	/* bitmap of idle nodes */
 extern bitstr_t *share_node_bitmap;	/* bitmap of sharable nodes */
 extern bitstr_t *up_node_bitmap;	/* bitmap of up nodes, not DOWN */
+extern bool ping_nodes_now;		/* if set, ping nodes immediately */
 
 /*****************************************************************************\
  *  PARTITION parameters and data structures