diff --git a/NEWS b/NEWS
index 0b92c9daa8645c734b66d94962211489190dcf2d..a0f885deaf1d3bfd10d2e78b709e898bd9b00215 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-This file describes changes in recent versions of Slurm. It primarily
+ This file describes changes in recent versions of Slurm. It primarily
 documents those changes that are of interest to users and administrators.
 
 * Changes in Slurm 15.08.0pre3
@@ -162,6 +162,8 @@ documents those changes that are of interest to users and administrators.
  -- Cray/BASIL - Check for mysql credentials in /root/.my.cnf.
  -- Fix sprio showing wrong priority for job arrays until priority is
     recalculated.
+ -- Account to batch step all CPUs that are allocated to a job not
+    just one since the batch step has access to all CPUs like other steps.
 
 * Changes in Slurm 14.11.4
 ==========================
diff --git a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
index 07a93238fe635c8f7b527be4c8e917f972ed3dbc..fe3d13a5b5fda7cffe83dc979e886d55f71efb09 100644
--- a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
+++ b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
@@ -2405,7 +2405,7 @@ extern int jobacct_storage_p_step_start(void *db_conn,
 		   script was running.
 		*/
 		snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->gres);
-		nodes = cpus = tasks = 1;
+		nodes = tasks = 1;
 	}
 
 	if (!step_ptr->job_ptr->db_index
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 0c8777e02e73a354939ba84c06fb355983f58a3a..e9b27d3337b5479610fe965c93efb8e81689cbdb 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -179,6 +179,7 @@ static int  _job_create(job_desc_msg_t * job_specs, int allocate, int will_run,
 			struct job_record **job_rec_ptr, uid_t submit_uid,
 			char **err_msg, uint16_t protocol_version);
 static void _job_timed_out(struct job_record *job_ptr);
+static void _kill_dependent(struct job_record *job_ptr);
 static void _list_delete_job(void *job_entry);
 static int  _list_find_job_id(void *job_entry, void *key);
 static int  _list_find_job_old(void *job_entry, void *key);
@@ -219,7 +220,7 @@ static job_array_resp_msg_t *_resp_array_xlate(resp_array_struct_t *resp,
 static int  _resume_job_nodes(struct job_record *job_ptr, bool indf_susp);
 static void _send_job_kill(struct job_record *job_ptr);
 static int  _set_job_id(struct job_record *job_ptr, bool global_job);
-static void  _set_job_requeue_exit_value(struct job_record *job_ptr);
+static void _set_job_requeue_exit_value(struct job_record *job_ptr);
 static void _signal_batch_job(struct job_record *job_ptr,
 			      uint16_t signal,
 			      uint16_t flags);
@@ -245,7 +246,6 @@ static int  _write_data_to_file(char *file_name, char *data);
 static int  _write_data_array_to_file(char *file_name, char **data,
 				      uint32_t size);
 static void _xmit_new_end_time(struct job_record *job_ptr);
-static void _kill_dependent(struct job_record *);
 
 /*
  * Functions used to manage job array responses with a separate return code