diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 3ae992525..da5453605 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -948,7 +948,6 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 
 	CopyCaretColors(netbuffer->u.serverinfo.servername, cv_servername.string,
 		MAXSERVERNAME);
-	strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), 7);
 
 	M_Memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, 16);
 
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 25899b77c..2bf1148de 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -284,7 +284,6 @@ struct serverinfo_pak
 	tic_t time;
 	tic_t leveltime;
 	char servername[MAXSERVERNAME];
-	char mapname[8];
 	char maptitle[33];
 	unsigned char mapmd5[16];
 	UINT8 actnum;
diff --git a/src/d_net.c b/src/d_net.c
index d2c481d87..aab76b8fe 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -924,9 +924,9 @@ static void DebugPrintpacket(const char *header)
 				netbuffer->u.servercfg.modifiedgame);
 			break;
 		case PT_SERVERINFO:
-			fprintf(debugfile, "    '%s' player %d/%d, map %s, filenum %d, time %u \n",
+			fprintf(debugfile, "    '%s' player %d/%d, filenum %d, time %u \n",
 				netbuffer->u.serverinfo.servername, netbuffer->u.serverinfo.numberofplayer,
-				netbuffer->u.serverinfo.maxplayer, netbuffer->u.serverinfo.mapname,
+				netbuffer->u.serverinfo.maxplayer,
 				netbuffer->u.serverinfo.fileneedednum,
 				(UINT32)LONG(netbuffer->u.serverinfo.time));
 			fprintfstringnewline((char *)netbuffer->u.serverinfo.fileneeded,