diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index ea456ba6..2cecb5e3 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -499,7 +499,7 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
 		}
 		buf[0] = target;
 		newmsg = msg+5+spc;
-		memcpy(msg, newmsg, 252);
+		strlcpy(msg, newmsg, 252);
 	}
 
 	SendNetXCmd(XD_SAY, buf, strlen(msg) + 1 + msg-buf);
@@ -1024,7 +1024,7 @@ static void HU_queueChatChar(char c)
 
 			// we need to get rid of the /pm<node>
 			newmsg = msg+5+spc;
-			memcpy(msg, newmsg, 255);
+			strlcpy(msg, newmsg, 255);
 		}
 		if (ci > 3) // don't send target+flags+empty message.
 		{