diff --git a/NEWS b/NEWS
index 84a6a4249df567cc28b36c2842fe867d113e2a7d..2f5417c7feb0c917770f19767cfda4434d829f43 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ documents those changes that are of interest to users and admins.
  -- Add spank/pbs plugin to set a bunch of PBS environment variables.
  -- Backported sh5util from master to 2.6 as there are some important
     bugfixes and the new item extraction feature.
+ -- select/cons_res - Corect MacCPUsPerNode partition constraint for CR_Socket.
 
 * Changes in Slurm 2.6.2
 ========================
diff --git a/src/plugins/select/cons_res/job_test.c b/src/plugins/select/cons_res/job_test.c
index 32bd205647939846cab9ca111defb0a48654d69d..fe249120ef5ed122f5cca4b4a1d02e6a12bc2897 100644
--- a/src/plugins/select/cons_res/job_test.c
+++ b/src/plugins/select/cons_res/job_test.c
@@ -238,9 +238,9 @@ uint16_t _allocate_sockets(struct job_record *job_ptr, bitstr_t *core_map,
 			used_cores[i] += free_cores[i];
 			free_cores[i] = 0;
 		}
-		free_cpu_count = free_cores[i] * threads_per_core;
+		free_cpu_count += free_cores[i] * threads_per_core;
 		if (used_cpu_array[i])
-			used_cpu_count = cores_per_socket * threads_per_core;
+			used_cpu_count = used_cores[i] * threads_per_core;
 	}
 	xfree(used_cores);
 	xfree(used_cpu_array);