Index: code/client/cl_main.c
===================================================================
--- code/client/cl_main.c	(revision 1802)
+++ code/client/cl_main.c	(working copy)
@@ -2237,7 +2237,7 @@
 ===================
 */
 void CL_ServersResponsePacket( const netadr_t* from, msg_t *msg, qboolean extended ) {
-	int				i, count, total;
+	int				i, j, count, total;
 	netadr_t addresses[MAX_SERVERSPERPACKET];
 	int				numservers;
 	byte*			buffptr;
@@ -2318,6 +2318,25 @@
 		// build net address
 		serverInfo_t *server = &cls.globalServers[count];
 
+		// Tequila: It's possible to have sent many master server requests. Then
+		// we may receive many times the same addresses from the master server.
+		// We just avoid to add a server if it is still in the global servers list.
+		for (j = 0; j < count; j++) {
+			if (NET_CompareAdr(cls.globalServers[j].adr,addresses[i]))
+				break;
+		}
+#if 0
+		if (j<count) {
+			Com_Printf("%d: %d/%d: server %s still in the list !!!\n", i, j, count, NET_AdrToStringwPort(addresses[i]));
+			continue;
+		}
+		else
+			Com_Printf("%d: %d/%d: server %s not in the list\n", i, j, count, NET_AdrToStringwPort(addresses[i]));
+#else
+		if (j<count)
+			continue;
+#endif
+
 		CL_InitServerInfo( server, &addresses[i] );
 		// advance to next slot
 		count++;