diff --git a/code/qcommon/cmd.cpp b/code/qcommon/cmd.cpp
index 1e84a27..8591b71 100644
--- a/code/qcommon/cmd.cpp
+++ b/code/qcommon/cmd.cpp
@@ -753,7 +753,8 @@ static void Cmd_List_f()
 	for (const cmd_function_t* cmd = cmd_functions; cmd; cmd = cmd->next) {
 		if (match && !Com_Filter(match, cmd->name))
 			continue;
-		Com_Printf( "%s\n", cmd->name );
+		const char h = cmd->help != NULL ? 'h' : ' ';
+		Com_Printf( " %c  %s\n", h, cmd->name );
 		++i;
 	}
 
diff --git a/code/qcommon/cvar.cpp b/code/qcommon/cvar.cpp
index 82beb72..40775cc 100644
--- a/code/qcommon/cvar.cpp
+++ b/code/qcommon/cvar.cpp
@@ -800,7 +800,7 @@ static void Cvar_List_f( void )
 		Com_Printf( (var->flags & CVAR_ARCHIVE) ? "A" : " " );
 		Com_Printf( (var->flags & CVAR_LATCH) ? "L" : " " );
 		Com_Printf( (var->flags & CVAR_CHEAT) ? "C" : " " );
-		Com_Printf( (var->flags & CVAR_USER_CREATED) ? "?" : " " );
+		Com_Printf( (var->flags & CVAR_USER_CREATED) ? "?" : (var->help ? "h" : " ") );
 
 		Com_Printf(" %s \"%s\"\n", var->name, var->string);
 	}