diff --git a/include/types/listener.h b/include/types/listener.h
index 876d3c372..95f3cc9ad 100644
--- a/include/types/listener.h
+++ b/include/types/listener.h
@@ -172,6 +172,7 @@ struct bind_conf {
 	unsigned long bind_thread; /* bitmask of threads allowed to use these listeners */
 	unsigned long thr_2, thr_4, thr_8, thr_16; /* intermediate values for bind_thread counting */
 	unsigned int thr_count;    /* #threads bound */
+	unsigned int thr_idx;      /* thread indexes for queue distribution : (t2<<16)+t1 */
 	uint32_t ns_cip_magic;     /* Excepted NetScaler Client IP magic number */
 	struct list by_fe;         /* next binding for the same frontend, or NULL */
 	char *arg;                 /* argument passed to "bind" for better error reporting */
diff --git a/src/listener.c b/src/listener.c
index 9a9699c94..3e080b4ff 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -847,12 +847,23 @@ void listener_accept(int fd)
 		count = l->bind_conf->thr_count;
 		if (count > 1 && (global.tune.options & GTUNE_LISTENER_MQ)) {
 			struct accept_queue_ring *ring;
-			int r, t1, t2, q1, q2;
+			int t1, t2, q1, q2;
 
-			/* pick two small distinct random values and drop lower bits */
-			r = (random() >> 8) % ((count - 1) * count);
-			t2 = r / count; // 0..thr_count-2
-			t1 = r % count; // 0..thr_count-1
+			/* pick a first thread ID using a round robin index,
+			 * and a second thread ID using a random. The
+			 * connection will be assigned to the one with the
+			 * least connections. This provides fairness on short
+			 * connections (round robin) and on long ones (conn
+			 * count).
+			 */
+			t1 = l->bind_conf->thr_idx;
+			do {
+				t2 = t1 + 1;
+				if (t2 >= count)
+					t2 = 0;
+			} while (!HA_ATOMIC_CAS(&l->bind_conf->thr_idx, &t1, t2));
+
+			t2 = (random() >> 8) % (count - 1);  // 0..thr_count-2
 			t2 += t1 + 1;   // necessarily different from t1
 
 			if (t2 >= count)