diff --git a/doc/Changelog b/doc/Changelog
index 88eac6c7c..bd5397ea7 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+15 May 2013: Wouter
+	- Fix round-robin doesn't work with some Windows clients (from Ilya
+	  Bakulin).
+
 3 May 2013: Wouter
 	- update acx_nlnetlabs.m4 to v23, sleep w32 fix.
 
diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index 34f3b8936..ead8aba31 100644
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -658,8 +658,9 @@ reply_info_encode(struct query_info* qinfo, struct reply_info* rep,
 			return 0;
 		}
 	}
-	/* roundrobin offset. using query id for random number */
-	rr_offset = RRSET_ROUNDROBIN?id:0;
+	/* roundrobin offset. using query id for random number.  With ntohs
+	 * for different roundrobins for sequential id client senders. */
+	rr_offset = RRSET_ROUNDROBIN?ntohs(id):0;
 
 	/* insert answer section */
 	if((r=insert_section(rep, rep->an_numrrsets, &ancount, buffer,