diff --git a/tools/lsp.c b/tools/lsp.c
index 8162546..450df32 100644
--- a/tools/lsp.c
+++ b/tools/lsp.c
@@ -25,6 +25,7 @@ show_usage (void)
 	fprintf (stderr, "List active Jack ports, and optionally display extra information.\n");
 	fprintf (stderr, "Optionally filter ports which match ALL strings provided after any options.\n\n");
 	fprintf (stderr, "Display options:\n");
+	fprintf (stderr, "        -s, --server <name>   Connect to the jack server named <name>\n");
 	fprintf (stderr, "        -A, --aliases         List aliases for each port\n");
 	fprintf (stderr, "        -c, --connections     List connections to/from each port\n");
 	fprintf (stderr, "        -l, --latency         Display per-port latency in frames at each port\n");
@@ -42,6 +43,7 @@ main (int argc, char *argv[])
 {
 	jack_client_t *client;
 	jack_status_t status;
+    jack_options_t options = JackNoStartServer;
 	const char **ports, **connections;
 	unsigned int i, j, k;
 	int skip_port;
@@ -54,8 +56,11 @@ main (int argc, char *argv[])
 	int c;
 	int option_index;
 	char* aliases[2];
+	char *server_name = NULL;
+
 	
 	struct option long_options[] = {
+	    { "server", 1, 0, 's' },
 		{ "aliases", 0, 0, 'A' },
 		{ "connections", 0, 0, 'c' },
 		{ "port-latency", 0, 0, 'l' },
@@ -74,8 +79,13 @@ main (int argc, char *argv[])
 		my_name ++;
 	}
 
-	while ((c = getopt_long (argc, argv, "AclLphvt", long_options, &option_index)) >= 0) {
+	while ((c = getopt_long (argc, argv, "s:AclLphvt", long_options, &option_index)) >= 0) {
 		switch (c) {
+		case 's':
+            server_name = (char *) malloc (sizeof (char) * strlen(optarg));
+            strcpy (server_name, optarg);
+            options |= JackServerName;
+            break;
 		case 'A':
 			aliases[0] = (char *) malloc (jack_port_name_size());
 			aliases[1] = (char *) malloc (jack_port_name_size());
@@ -114,9 +124,7 @@ main (int argc, char *argv[])
 	/* Open a client connection to the JACK server.  Starting a
 	 * new server only to list its ports seems pointless, so we
 	 * specify JackNoStartServer. */
-	//JOQ: need a new server name option
-
-	client = jack_client_open ("lsp", JackNoStartServer, &status);
+	client = jack_client_open ("lsp", options, &status, server_name);
 	if (client == NULL) {
 		if (status & JackServerFailed) {
 			fprintf (stderr, "JACK server not running\n");