diff --git a/engine/client/keys.c b/engine/client/keys.c
index b87044ce..3f8d3ae2 100644
--- a/engine/client/keys.c
+++ b/engine/client/keys.c
@@ -1136,9 +1136,9 @@ void Key_Bind_f (void)
 	cmd[0] = 0;		// start out with a null string
 	for (i=2 ; i< c ; i++)
 	{
-		strcat (cmd, Cmd_Argv(i));
+		Q_strncatz (cmd, Cmd_Argv(i), sizeof(cmd));
 		if (i != (c-1))
-			strcat (cmd, " ");
+			Q_strncatz (cmd, " ", sizeof(cmd));
 	}
 
 	Key_SetBinding (b, modifier, cmd, Cmd_ExecLevel);
@@ -1182,9 +1182,9 @@ void Key_BindLevel_f (void)
 	cmd[0] = 0;		// start out with a null string
 	for (i=3 ; i< c ; i++)
 	{
-		strcat (cmd, Cmd_Argv(i));
+		Q_strncatz (cmd, Cmd_Argv(i), sizeof(cmd));
 		if (i != (c-1))
-			strcat (cmd, " ");
+			Q_strncatz (cmd, " ", sizeof(cmd));
 	}
 
 	Key_SetBinding (b, modifier, cmd, atoi(Cmd_Argv(2)));