diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 45055276e..9866de479 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -743,6 +743,7 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_httpsource);
 #ifndef NONET
 	CV_RegisterVar(&cv_allownewplayer);
+	CV_RegisterVar(&cv_chatlogsize);
 #ifdef VANILLAJOINNEXTROUND
 	CV_RegisterVar(&cv_joinnextround);
 #endif
diff --git a/src/g_game.h b/src/g_game.h
index 688ce3d5b..0f55724c0 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -163,6 +163,10 @@ extern consvar_t cv_resetspecialmusic;
 extern consvar_t cv_resume;
 extern consvar_t cv_fading;
 
+#ifndef NONET
+extern consvar_t cv_chatlogsize;
+#endif
+
 typedef enum
 {
 	AXISNONE = 0,
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 60b1d14da..effb24837 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -378,6 +378,11 @@ void HU_Start(void)
 
 // EVERY CHANGE IN THIS SCRIPT IS LOL XD! BY VINCYTM
 
+static void Chatlogsize_OnChange(void);
+
+static CV_PossibleValue_t chatlogsize_cons_t[] = {{8, "MIN"}, {MAX_CHAT_BUFSIZE, "MAX"}, {0, NULL}};
+consvar_t cv_chatlogsize = {"chatlogsize", "64", CV_CALL|CV_SAVE, chatlogsize_cons_t, Chatlogsize_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
 static UINT32 chat_nummsg_log = 0;
 static UINT32 chat_nummsg_min = 0;
 static UINT32 chat_scroll = 0;
@@ -385,10 +390,7 @@ static tic_t chat_scrolltime = 0;
 
 static UINT32 chat_maxscroll = 0; // how far can we scroll?
 
-//static chatmsg_t chat_mini[CHAT_BUFSIZE]; // Display the last few messages sent.
-//static chatmsg_t chat_log[CHAT_BUFSIZE]; // Keep every message sent to us in memory so we can scroll n shit, it's cool.
-
-static char chat_log[CHAT_BUFSIZE][255]; // hold the last 48 or so messages in that log.
+static char **chat_log = NULL;
 static char chat_mini[8][255]; // display up to 8 messages that will fade away / get overwritten
 static tic_t chat_timers[8];
 
@@ -416,13 +418,35 @@ static void HU_removeChatText_Mini(void)
 // same but w the log. TODO: optimize this and maybe merge in a single func? im bad at C.
 static void HU_removeChatText_Log(void)
 {
-	// MPC: Don't create new arrays, just iterate through an existing one
+	// We don't have any messages, idiot!
+	if (!chat_nummsg_log)
+		return;
+
+	free(chat_log[0]);
 	size_t i;
 	for(i=0;i<chat_nummsg_log-1;i++) {
-		strcpy(chat_log[i], chat_log[i+1]);
+		chat_log[i] = chat_log[i+1];
 	}
 	chat_nummsg_log--; // lost 1 msg.
 }
+
+static void Chatlogsize_OnChange(void)
+{
+	// Free unneeded messages
+	while (chat_nummsg_log > (UINT32)cv_chatlogsize.value)
+	{
+		HU_removeChatText_Log();
+	}
+
+// Some versons of C don't have reallocarray sadly
+#define reallocarray(ptr, nmemb, size) realloc(ptr, (nmemb)*(size))
+
+	// TODO - use z_zone allocators?
+	chat_log = reallocarray(chat_log, cv_chatlogsize.value, sizeof(char*));
+
+#undef reallocarray
+	chat_nummsg_log = min(chat_nummsg_log, (UINT32)cv_chatlogsize.value);
+}
 #endif
 
 void HU_AddChatText(const char *text, boolean playsound)
@@ -432,11 +456,19 @@ void HU_AddChatText(const char *text, boolean playsound)
 		S_StartSound(NULL, sfx_radio);
 	// reguardless of our preferences, put all of this in the chat buffer in case we decide to change from oldchat mid-game.
 
-	if (chat_nummsg_log >= CHAT_BUFSIZE) // too many messages!
+	// Uuuh dunno how that can happen but a bit of paranoia is never too bad
+	if (!chat_log)
+	{
+		//I_Error("Chat log is not allocated what the fuck"); // uwu
+		Chatlogsize_OnChange(); // Lets hope that will surely allocate some memory for us
+	}
+
+	if (chat_nummsg_log >= (UINT32)cv_chatlogsize.value) // too many messages!
 		HU_removeChatText_Log();
 
+	chat_log[chat_nummsg_log] = malloc(HU_MSGBUFSIZE);
 	strcpy(chat_log[chat_nummsg_log], text);
-	chat_nummsg_log++;
+	++chat_nummsg_log;
 
 	if (chat_nummsg_min >= 8)
 		HU_removeChatText_Mini();
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 6842a17aa..f0ef731b6 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -62,7 +62,8 @@ typedef struct
 //           chat stuff
 //------------------------------------
 #define HU_MAXMSGLEN 223
-#define CHAT_BUFSIZE 64		// that's enough messages, right? We'll delete the older ones when that gets out of hand.
+#define HU_MSGBUFSIZE 255
+#define MAX_CHAT_BUFSIZE 256		// that's enough messages, right? We'll delete the older ones when that gets out of hand.
 #define NETSPLITSCREEN // why the hell WOULDN'T we want this?
 #ifdef NETSPLITSCREEN
 #define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
diff --git a/src/m_menu.c b/src/m_menu.c
index bb19230c0..ac3bc3d41 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1533,8 +1533,9 @@ static menuitem_t OP_ChatOptionsMenu[] =
 	{IT_STRING | IT_CVAR, NULL, "Chat Background Tint",		&cv_chatbacktint,		50},
 	{IT_STRING | IT_CVAR, NULL, "Message Fadeout Time",		&cv_chattime,			60},
 	{IT_STRING | IT_CVAR, NULL, "Spam Protection",			&cv_chatspamprotection,	70},
+	{IT_STRING | IT_CVAR, NULL, "Max Chat Messages",		&cv_chatlogsize,		80},
 
-	{IT_STRING | IT_CVAR, NULL, "Local ping display",		&cv_showping,			90},	// shows ping next to framerate if we want to.
+	{IT_STRING | IT_CVAR, NULL, "Local ping display",		&cv_showping,			100},	// shows ping next to framerate if we want to.
 };
 
 static menuitem_t OP_GameOptionsMenu[] =