diff --git a/daemon/cmd.h b/daemon/cmd.h
index 1a19bbe0..a4c847a5 100644
--- a/daemon/cmd.h
+++ b/daemon/cmd.h
@@ -68,5 +68,6 @@ bool ladish_command_save_studio(void * call_ptr, struct ladish_cqueue * queue_pt
 bool ladish_command_start_studio(void * call_ptr, struct ladish_cqueue * queue_ptr);
 bool ladish_command_stop_studio(void * call_ptr, struct ladish_cqueue * queue_ptr);
 bool ladish_command_unload_studio(void * call_ptr, struct ladish_cqueue * queue_ptr);
+bool ladish_command_exit(void * call_ptr, struct ladish_cqueue * queue_ptr);
 
 #endif /* #ifndef CMD_H__28542C9B_7CB8_40F8_BBB6_DCE13CBB1E7F__INCLUDED */
diff --git a/daemon/cmd_exit.c b/daemon/cmd_exit.c
new file mode 100644
index 00000000..31bc03e2
--- /dev/null
+++ b/daemon/cmd_exit.c
@@ -0,0 +1,77 @@
+/* -*- Mode: C ; c-basic-offset: 2 -*- */
+/*
+ * LADI Session Handler (ladish)
+ *
+ * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ *
+ **************************************************************************
+ * This file contains implementation of the "deactivate daemon" command
+ **************************************************************************
+ *
+ * LADI Session Handler is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * LADI Session Handler is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LADI Session Handler. If not, see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "cmd.h"
+#include "studio_internal.h"
+#include "control.h"
+
+#define cmd_ptr ((struct ladish_command *)context)
+
+static bool run(void * context)
+{
+  ASSERT(cmd_ptr->state == LADISH_COMMAND_STATE_PENDING);
+  cmd_ptr->state = LADISH_COMMAND_STATE_DONE;
+  g_quit = true;                /* cause main loop quit */
+  return false;                 /* cause command queue clear  */
+}
+
+#undef cmd_ptr
+
+bool ladish_command_exit(void * call_ptr, struct ladish_cqueue * queue_ptr)
+{
+  struct ladish_command * cmd_ptr;
+
+  if (!ladish_command_unload_studio(call_ptr, queue_ptr))
+  {
+    goto fail;
+  }
+
+  cmd_ptr = ladish_command_new(sizeof(struct ladish_command));
+  if (cmd_ptr == NULL)
+  {
+    log_error("ladish_command_new() failed.");
+    goto fail_drop_unload_command;
+  }
+
+  cmd_ptr->run = run;
+
+  if (!ladish_cqueue_add_command(queue_ptr, cmd_ptr))
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "ladish_cqueue_add_command() failed.");
+    goto fail_destroy_command;
+  }
+
+  return true;
+
+fail_destroy_command:
+  free(cmd_ptr);
+
+fail_drop_unload_command:
+  ladish_cqueue_drop_command(queue_ptr);
+
+fail:
+  return false;
+}
diff --git a/daemon/control.c b/daemon/control.c
index 9eb944b3..f82997c1 100644
--- a/daemon/control.c
+++ b/daemon/control.c
@@ -283,7 +283,15 @@ fail:
 static void ladish_exit(struct dbus_method_call * call_ptr)
 {
   log_info("Exit command received through D-Bus");
-  g_quit = true;
+
+  if (!ladish_command_exit(NULL, &g_studio.cmd_queue))
+  { /* if queuing of command failed, force exit anyway,
+       JACK server will be left started,
+       but refusing exit command is worse */
+    g_quit = true;
+  }
+
+  method_return_new_void(call_ptr);
 }
 
 void emit_studio_appeared()
diff --git a/daemon/studio.c b/daemon/studio.c
index 3ad48445..700e0468 100644
--- a/daemon/studio.c
+++ b/daemon/studio.c
@@ -189,6 +189,10 @@ void studio_run(void)
   bool state;
 
   ladish_cqueue_run(&g_studio.cmd_queue);
+  if (g_quit)
+  { /* if quit is requested, don't bother to process external events */
+    return;
+  }
 
   if (ladish_environment_consume_change(&g_studio.env_store, ladish_environment_jack_server_started, &state))
   {
diff --git a/wscript b/wscript
index 5d56a68c..ceb59e23 100644
--- a/wscript
+++ b/wscript
@@ -216,6 +216,7 @@ def build(bld):
         'cmd_start_studio.c',
         'cmd_stop_studio.c',
         'cmd_unload_studio.c',
+        'cmd_exit.c',
         'cqueue.c',
         ]:
         daemon.source.append(os.path.join("daemon", source))