diff --git a/NEWS b/NEWS
index f31fea1..28fd511 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 User-visible changes between 2.5 and 2.6 include:
 
  - Bugfix: A key volume of zero means key off.
+ - Feature: Don't start jackd when starting jack-keyboard.
 
 User-visible changes between 2.4 and 2.5 include:
 
diff --git a/src/jack-keyboard.c b/src/jack-keyboard.c
index 4c18caa..85a85ba 100644
--- a/src/jack-keyboard.c
+++ b/src/jack-keyboard.c
@@ -739,7 +739,7 @@ init_jack(void)
 	lash_event_t *event;
 #endif
 
-	jack_client = jack_client_open(PACKAGE_NAME, JackNullOption, NULL);
+	jack_client = jack_client_open(PACKAGE_NAME, JackNoStartServer, NULL);
 
 	if (jack_client == NULL) {
 		g_critical("Could not connect to the JACK server; run jackd first?");