diff --git a/cmd-list-clients.c b/cmd-list-clients.c
index 026f12a7..2a4728b8 100644
--- a/cmd-list-clients.c
+++ b/cmd-list-clients.c
@@ -31,8 +31,8 @@ int	cmd_list_clients_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_list_clients_entry = {
 	"list-clients", "lsc",
-	"", 0, 0,
-	"",
+	"t:", 0, 0,
+	CMD_TARGET_SESSION_USAGE,
 	0,
 	NULL,
 	NULL,
@@ -41,12 +41,21 @@ const struct cmd_entry cmd_list_clients_entry = {
 
 /* ARGSUSED */
 int
-cmd_list_clients_exec(unused struct cmd *self, struct cmd_ctx *ctx)
+cmd_list_clients_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
+	struct args 	*args = self->args;
 	struct client	*c;
+	struct session  *s;
 	u_int		 i;
 	const char	*s_utf8;
 
+	if (args_has(args, 't')) {
+		s = cmd_find_session(ctx, args_get(args, 't'), 0);
+		if (s == NULL)
+			return (-1);
+	} else
+		s = NULL;
+
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
 		if (c == NULL || c->session == NULL)
@@ -56,6 +65,9 @@ cmd_list_clients_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 			s_utf8 = " (utf8)";
 		else
 			s_utf8 = "";
+
+		if (s != NULL && s != c->session)
+			continue;
 		ctx->print(ctx, "%s: %s [%ux%u %s]%s", c->tty.path,
 		    c->session->name, c->tty.sx, c->tty.sy,
 		    c->tty.termname, s_utf8);
diff --git a/tmux.1 b/tmux.1
index af0469c8..8e9da6fe 100644
--- a/tmux.1
+++ b/tmux.1
@@ -598,9 +598,11 @@ server and clients and destroy all sessions.
 .It Ic kill-session Op Fl t Ar target-session
 Destroy the given session, closing any windows linked to it and no other
 sessions, and detaching all clients attached to it.
-.It Ic list-clients
+.It Ic list-clients Op Fl t Ar target-session
 .D1 (alias: Ic lsc )
-List all clients attached to the server.
+List all clients attached to the server. If 
+.Ar target-session
+is specified, list only clients connected to that session.
 .It Ic list-commands
 .D1 (alias: Ic lscm )
 List the syntax of all commands supported by