diff --git a/engine/client/cl_debug.c b/engine/client/cl_debug.c
index 588cf341..00e21ea4 100644
--- a/engine/client/cl_debug.c
+++ b/engine/client/cl_debug.c
@@ -52,9 +52,23 @@ const char *CL_MsgInfo( int cmd )
 		// get engine message name
 		const char *svc_string = NULL;
 
-		if( cls.legacymode )
+		switch( cls.legacymode )
+		{
+		case PROTO_CURRENT:
+			svc_string = svc_strings[cmd];
+			break;
+		case PROTO_LEGACY:
 			svc_string = svc_legacy_strings[cmd];
+			break;
+		case PROTO_QUAKE:
+			svc_string = svc_quake_strings[cmd];
+			break;
+		case PROTO_GOLDSRC:
+			svc_string = svc_goldsrc_strings[cmd];
+			break;
+		}
 
+		// fall back to current protocol strings
 		if( !svc_string )
 			svc_string = svc_strings[cmd];
 
diff --git a/engine/common/net_buffer.c b/engine/common/net_buffer.c
index 5372f3ae..afeb5b43 100644
--- a/engine/common/net_buffer.c
+++ b/engine/common/net_buffer.c
@@ -119,6 +119,27 @@ const char *svc_goldsrc_strings[svc_lastmsg+1] =
 	[svc_goldsrc_sendcvarvalue2] = "svc_goldsrc_sendcvarvalue2",
 };
 
+const char *svc_quake_strings[svc_lastmsg+1] =
+{
+	[svc_updatestat] = "svc_quake_updatestat",
+	[svc_version] = "svc_quake_version",
+	[svc_updatename] = "svc_quake_updatename",
+	[svc_updatefrags] = "svc_quake_updatefrags",
+	[svc_stopsound] = "svc_quake_stopsound",
+	[svc_updatecolors] = "svc_quake_updatecolors",
+	[svc_damage] = "svc_quake_damage",
+	[svc_spawnbinary] = "svc_quake_spawnbinary",
+	[svc_killedmonster] = "svc_quake_killedmonster",
+	[svc_foundsecret] = "svc_quake_foundsecret",
+	[svc_spawnstaticsound] = "svc_quake_spawnstaticsound",
+	[svc_sellscreen] = "svc_quake_sellscreen",
+	[svc_showlmp] = "svc_quake_showlmp",
+	[svc_hidelmp] = "svc_quake_hidelmp",
+	[svc_skybox] = "svc_quake_skybox",
+	[svc_skyboxsize] = "svc_quake_skyboxsize",
+	[svc_fog] = "svc_quake_fog",
+};
+
 void MSG_InitMasks( void )
 {
 	uint	startbit, endbit;
diff --git a/engine/common/protocol.h b/engine/common/protocol.h
index c5b4d301..0d8a839e 100644
--- a/engine/common/protocol.h
+++ b/engine/common/protocol.h
@@ -279,6 +279,7 @@ GNU General Public License for more details.
 
 extern const char	*svc_strings[svc_lastmsg+1];
 extern const char	*svc_legacy_strings[svc_lastmsg+1];
+extern const char	*svc_quake_strings[svc_lastmsg+1];
 extern const char	*svc_goldsrc_strings[svc_lastmsg+1];
 extern const char	*clc_strings[clc_lastmsg+1];