diff --git a/Quake/cl_main.c b/Quake/cl_main.c
index 4159f1cd..30c8718d 100644
--- a/Quake/cl_main.c
+++ b/Quake/cl_main.c
@@ -633,13 +633,13 @@ int CL_ReadFromServer (void)
 
 	//visedicts
 	if (cl_numvisedicts > 256 && dev_peakstats.visedicts <= 256)
-		Con_DWarning ("%i visedicts exceeds standard limit of 256.\n", cl_numvisedicts);
+		Con_DWarning ("%i visedicts exceeds standard limit of 256 (max = %d).\n", cl_numvisedicts, MAX_VISEDICTS);
 	dev_stats.visedicts = cl_numvisedicts;
 	dev_peakstats.visedicts = q_max(cl_numvisedicts, dev_peakstats.visedicts);
 
 	//temp entities
 	if (num_temp_entities > 64 && dev_peakstats.tempents <= 64)
-		Con_DWarning ("%i tempentities exceeds standard limit of 64.\n", num_temp_entities);
+		Con_DWarning ("%i tempentities exceeds standard limit of 64 (max = %d).\n", num_temp_entities, MAX_TEMP_ENTITIES);
 	dev_stats.tempents = num_temp_entities;
 	dev_peakstats.tempents = q_max(num_temp_entities, dev_peakstats.tempents);
 
@@ -648,7 +648,7 @@ int CL_ReadFromServer (void)
 		if (b->model && b->endtime >= cl.time)
 			num_beams++;
 	if (num_beams > 24 && dev_peakstats.beams <= 24)
-		Con_DWarning ("%i beams exceeded standard limit of 24.\n", num_beams);
+		Con_DWarning ("%i beams exceeded standard limit of 24 (max = %d).\n", num_beams, MAX_BEAMS);
 	dev_stats.beams = num_beams;
 	dev_peakstats.beams = q_max(num_beams, dev_peakstats.beams);
 
@@ -657,7 +657,7 @@ int CL_ReadFromServer (void)
 		if (l->die >= cl.time && l->radius)
 			num_dlights++;
 	if (num_dlights > 32 && dev_peakstats.dlights <= 32)
-		Con_DWarning ("%i dlights exceeded standard limit of 32.\n", num_dlights);
+		Con_DWarning ("%i dlights exceeded standard limit of 32 (max = %d).\n", num_dlights, MAX_DLIGHTS);
 	dev_stats.dlights = num_dlights;
 	dev_peakstats.dlights = q_max(num_dlights, dev_peakstats.dlights);
 
diff --git a/Quake/cl_parse.c b/Quake/cl_parse.c
index 6e14ef41..75bacdaf 100644
--- a/Quake/cl_parse.c
+++ b/Quake/cl_parse.c
@@ -340,7 +340,7 @@ void CL_ParseServerInfo (void)
 
 	//johnfitz -- check for excessive models
 	if (nummodels >= 256)
-		Con_DWarning ("%i models exceeds standard limit of 256.\n", nummodels);
+		Con_DWarning ("%i models exceeds standard limit of 256 (max = %d).\n", nummodels, MAX_MODELS);
 	//johnfitz
 
 // precache sounds
@@ -360,7 +360,7 @@ void CL_ParseServerInfo (void)
 
 	//johnfitz -- check for excessive sounds
 	if (numsounds >= 256)
-		Con_DWarning ("%i sounds exceeds standard limit of 256.\n", numsounds);
+		Con_DWarning ("%i sounds exceeds standard limit of 256 (max = %d).\n", numsounds, MAX_SOUNDS);
 	//johnfitz
 
 //
@@ -1144,7 +1144,7 @@ void CL_ParseServerMessage (void)
 			if (i == 2)
 			{
 				if (cl.num_statics > 128)
-					Con_DWarning ("%i static entities exceeds standard limit of 128.\n", cl.num_statics);
+					Con_DWarning ("%i static entities exceeds standard limit of 128 (max = %d).\n", cl.num_statics, MAX_STATIC_ENTITIES);
 				R_CheckEfrags ();
 			}
 			//johnfitz
diff --git a/Quake/gl_model.c b/Quake/gl_model.c
index 321b6d57..d4854580 100644
--- a/Quake/gl_model.c
+++ b/Quake/gl_model.c
@@ -1905,7 +1905,7 @@ void Mod_LoadSubmodels (lump_t *l)
 		Sys_Error ("Mod_LoadSubmodels: too many visleafs (%d, max = %d) in %s", out->visleafs, MAX_MAP_LEAFS, loadmodel->name);
 
 	if (out->visleafs > 8192)
-		Con_DWarning ("%i visleafs exceeds standard limit of 8192.\n", out->visleafs);
+		Con_DWarning ("%i visleafs exceeds standard limit of 8192 (max = %d).\n", out->visleafs, MAX_MAP_LEAFS);
 	//johnfitz
 }
 
diff --git a/Quake/gl_refrag.c b/Quake/gl_refrag.c
index be038113..5a2f3311 100644
--- a/Quake/gl_refrag.c
+++ b/Quake/gl_refrag.c
@@ -178,7 +178,7 @@ void R_CheckEfrags (void)
 		;
 
 	if (count > 640 && dev_peakstats.efrags <= 640)
-		Con_DWarning ("%i efrags exceeds standard limit of 640.\n", count);
+		Con_DWarning ("%i efrags exceeds standard limit of 640 (max = %d).\n", count, MAX_EFRAGS);
 
 	dev_stats.efrags = count;
 	dev_peakstats.efrags = q_max(count, dev_peakstats.efrags);
diff --git a/Quake/host.c b/Quake/host.c
index 8481b09c..602e39f6 100644
--- a/Quake/host.c
+++ b/Quake/host.c
@@ -655,7 +655,7 @@ void Host_ServerFrame (void)
 				active++;
 		}
 		if (active > 600 && dev_peakstats.edicts <= 600)
-			Con_DWarning ("%i edicts exceeds standard limit of 600.\n", active);
+			Con_DWarning ("%i edicts exceeds standard limit of 600 (max = %d).\n", active, sv.max_edicts);
 		dev_stats.edicts = active;
 		dev_peakstats.edicts = q_max(active, dev_peakstats.edicts);
 	}
diff --git a/Quake/pr_cmds.c b/Quake/pr_cmds.c
index afdd69b3..ac8344ca 100644
--- a/Quake/pr_cmds.c
+++ b/Quake/pr_cmds.c
@@ -65,7 +65,7 @@ static char *PF_VarString (int	first)
 		}
 	}
 	if (s > 255)
-		Con_DWarning("PF_VarString: %i characters exceeds standard limit of 255.\n", (int) s);
+		Con_DWarning("PF_VarString: %i characters exceeds standard limit of 255 (max = %d).\n", (int) s, (int)(sizeof(out) - 1));
 	return out;
 }
 
diff --git a/Quake/r_brush.c b/Quake/r_brush.c
index d9bde1ef..7155e5ef 100644
--- a/Quake/r_brush.c
+++ b/Quake/r_brush.c
@@ -947,7 +947,7 @@ void GL_BuildLightmaps (void)
 
 	//johnfitz -- warn about exceeding old limits
 	if (i >= 64)
-		Con_DWarning ("%i lightmaps exceeds standard limit of 64.\n", i);
+		Con_DWarning ("%i lightmaps exceeds standard limit of 64 (max = %d).\n", i, MAX_LIGHTMAPS);
 	//johnfitz
 }
 
diff --git a/Quake/sv_main.c b/Quake/sv_main.c
index 401b43ad..6cfa20e7 100644
--- a/Quake/sv_main.c
+++ b/Quake/sv_main.c
@@ -731,7 +731,7 @@ void SV_WriteEntitiesToClient (edict_t	*clent, sizebuf_t *msg)
 	//johnfitz -- devstats
 stats:
 	if (msg->cursize > 1024 && dev_peakstats.packetsize <= 1024)
-		Con_DWarning ("%i byte packet exceeds standard limit of 1024.\n", msg->cursize);
+		Con_DWarning ("%i byte packet exceeds standard limit of 1024 (max = %d).\n", msg->cursize, msg->maxsize);
 	dev_stats.packetsize = msg->cursize;
 	dev_peakstats.packetsize = q_max(msg->cursize, dev_peakstats.packetsize);
 	//johnfitz
@@ -1462,7 +1462,7 @@ void SV_SpawnServer (const char *server)
 
 	//johnfitz -- warn if signon buffer larger than standard server can handle
 	if (sv.signon.cursize > 8000-2) //max size that will fit into 8000-sized client->message buffer with 2 extra bytes on the end
-		Con_DWarning ("%i byte signon buffer exceeds standard limit of 7998.\n", sv.signon.cursize);
+		Con_DWarning ("%i byte signon buffer exceeds standard limit of 7998 (max = %d).\n", sv.signon.cursize, sv.signon.maxsize);
 	//johnfitz
 
 // send serverinfo to all connected clients