diff --git a/engine/common/cmd.c b/engine/common/cmd.c
index fdc7fe449..3456b0fc7 100644
--- a/engine/common/cmd.c
+++ b/engine/common/cmd.c
@@ -877,10 +877,19 @@ void Cmd_AliasList_f (void)
 {
 	cmdalias_t	*cmd;
 	int num=0;
+	int flags;
+
+	if (!strcmp(Cmd_Argv(1), "server"))
+		flags = ALIAS_FROMSERVER;
+	else
+		flags = 0;
+
 	for (cmd=cmd_alias ; cmd ; cmd=cmd->next)
 	{
 		if ((cmd->restriction?cmd->restriction:rcon_level.value) > Cmd_ExecLevel)
 			continue;
+		if (flags && !(cmd->flags & flags))
+			continue;
 		if (!num)
 			Con_TPrintf(TL_ALIASLIST);
 		if (cmd->execlevel)