diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb9b3d1..71a8861 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,40 +1,41 @@
 include_directories(${PULSEAUDIO_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}     ${GCONF_INCLUDE_DIRS}
     ${GOBJECT_INCLUDE_DIRS})
 
 set(SRC_LIST
     card.cpp
     client.cpp
     context.cpp
     device.cpp
     maps.cpp
     operation.cpp
     port.cpp
     profile.cpp
     pulseaudio.cpp
     pulseobject.cpp
     sink.cpp
     sinkinput.cpp
     modulemanager.cpp
     gconfitem.cpp
     source.cpp
     sourceoutput.cpp
     stream.cpp
     volumeobject.cpp
     debug.cpp
     server.cpp
     streamrestore.cpp
 )
 
 add_library(QPulseAudioPrivate SHARED ${SRC_LIST})
 target_link_libraries(QPulseAudioPrivate
     Qt5::Core
     Qt5::Gui
+    Qt5::DBus
     ${PULSEAUDIO_LIBRARY}
     ${PULSEAUDIO_MAINLOOP_LIBRARY}
     ${GCONF_LDFLAGS}
     ${GOBJECT_LDFLAGS}
 )
 install(TARGETS QPulseAudioPrivate ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_subdirectory(kcm)
 add_subdirectory(qml)
diff --git a/src/context.cpp b/src/context.cpp
index ece8cd9..023bffa 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1,532 +1,544 @@
 /*
     Copyright 2014-2015 Harald Sitter <sitter@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) version 3, or any
     later version accepted by the membership of KDE e.V. (or its
     successor approved by the membership of KDE e.V.), which shall
     act as a proxy defined in Section 6 of version 3 of the license.
 
     This library 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
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "context.h"
 #include "server.h"
 
 #include <QAbstractEventDispatcher>
 #include "debug.h"
 #include <QMutexLocker>
 #include <QTimer>
+#include <QDBusServiceWatcher>
+#include <QDBusConnection>
 
 #include "card.h"
 #include "client.h"
 #include "sink.h"
 #include "sinkinput.h"
 #include "source.h"
 #include "sourceoutput.h"
 #include "streamrestore.h"
 
 namespace QPulseAudio
 {
 
 Context* Context::s_context = nullptr;
 
 static bool isGoodState(int eol)
 {
     if (eol < 0) {
         // Error
         return false;
     }
 
     if (eol > 0) {
         // End of callback chain
         return false;
     }
 
     return true;
 }
 
 // --------------------------
 
 static void sink_cb(pa_context *context, const pa_sink_info *info, int eol, void *data)
 {
     if (!isGoodState(eol))
         return;
     Q_ASSERT(context);
     Q_ASSERT(data);
     ((Context *)data)->sinkCallback(info);
 }
 
 static void sink_input_callback(pa_context *context, const pa_sink_input_info *info, int eol, void *data)
 {
     if (!isGoodState(eol))
         return;
     // pulsesink probe is used by gst-pulse only to query sink formats (not for playback)
     if (qstrcmp(info->name, "pulsesink probe") == 0) {
         return;
     }
     if (const char *id = pa_proplist_gets(info->proplist, "module-stream-restore.id")) {
         if (qstrcmp(id, "sink-input-by-media-role:event") == 0) {
             qCDebug(PLASMAPA) << "Ignoring event role sink input.";
             return;
         }
     }
     Q_ASSERT(context);
     Q_ASSERT(data);
     ((Context *)data)->sinkInputCallback(info);
 }
 
 static void source_cb(pa_context *context, const pa_source_info *info, int eol, void *data)
 {
     if (!isGoodState(eol))
         return;
     // FIXME: This forces excluding monitors
     if (info->monitor_of_sink != PA_INVALID_INDEX)
         return;
     Q_ASSERT(context);
     Q_ASSERT(data);
     ((Context *)data)->sourceCallback(info);
 }
 
 static void source_output_cb(pa_context *context, const pa_source_output_info *info, int eol, void *data)
 {
     if (!isGoodState(eol))
         return;
     // FIXME: This forces excluding these apps
     if (const char *app = pa_proplist_gets(info->proplist, PA_PROP_APPLICATION_ID)) {
         if (strcmp(app, "org.PulseAudio.pavucontrol") == 0
                 || strcmp(app, "org.gnome.VolumeControl") == 0
                 || strcmp(app, "org.kde.kmixd") == 0)
             return;
     }
     Q_ASSERT(context);
     Q_ASSERT(data);
     ((Context *)data)->sourceOutputCallback(info);
 }
 
 static void client_cb(pa_context *context, const pa_client_info *info, int eol, void *data)
 {
     if (!isGoodState(eol))
         return;
     Q_ASSERT(context);
     Q_ASSERT(data);
     ((Context *)data)->clientCallback(info);
 }
 
 static void card_cb(pa_context *context, const pa_card_info *info, int eol, void *data)
 {
     if (!isGoodState(eol))
         return;
     Q_ASSERT(context);
     Q_ASSERT(data);
     ((Context *)data)->cardCallback(info);
 }
 
 static void server_cb(pa_context *context, const pa_server_info *info, void *data)
 {
     Q_ASSERT(context);
     Q_ASSERT(data);
     ((Context *)data)->serverCallback(info);
 }
 
 static void context_state_callback(pa_context *context, void *data)
 {
     Q_ASSERT(data);
     ((Context *)data)->contextStateCallback(context);
 }
 
 static void subscribe_cb(pa_context *context, pa_subscription_event_type_t type, uint32_t index, void *data)
 {
     Q_ASSERT(data);
     ((Context *)data)->subscribeCallback(context, type, index);
 }
 
 static void ext_stream_restore_read_cb(pa_context *context, const pa_ext_stream_restore_info *info, int eol, void *data)
 {
     if (!isGoodState(eol)) {
         return;
     }
     Q_ASSERT(context);
     Q_ASSERT(data);
     ((Context *)data)->streamRestoreCallback(info);
 }
 
 static void ext_stream_restore_subscribe_cb(pa_context *context, void *data)
 {
     Q_ASSERT(context);
     Q_ASSERT(data);
     if (!PAOperation(pa_ext_stream_restore_read(context, ext_stream_restore_read_cb, data))) {
         qCWarning(PLASMAPA) << "pa_ext_stream_restore_read() failed";
     }
 }
 
 // --------------------------
 
 Context::Context(QObject *parent)
     : QObject(parent)
     , m_server(new Server(this))
     , m_context(nullptr)
     , m_mainloop(nullptr)
     , m_references(0)
 {
+    QDBusServiceWatcher *watcher = new QDBusServiceWatcher(QStringLiteral("org.pulseaudio.Server"),
+                                                           QDBusConnection::sessionBus(),
+                                                           QDBusServiceWatcher::WatchForRegistration,
+                                                           this);
+    connect(watcher, &QDBusServiceWatcher::serviceRegistered, this, [this]() {
+        if (!m_context) {
+            connectToDaemon();
+        }
+    });
+
     connectToDaemon();
 }
 
 Context::~Context()
 {
     if (m_context) {
         pa_context_unref(m_context);
         m_context = nullptr;
     }
 
     if (m_mainloop) {
         pa_glib_mainloop_free(m_mainloop);
         m_mainloop = nullptr;
     }
 
     reset();
 }
 
 Context *Context::instance()
 {
     if (!s_context) {
         s_context = new Context;
     }
     return s_context;
 }
 
 void Context::ref()
 {
     ++m_references;
 }
 
 void Context::unref()
 {
     if (--m_references == 0) {
         delete this;
         s_context = nullptr;
     }
 }
 
 void Context::subscribeCallback(pa_context *context, pa_subscription_event_type_t type, uint32_t index)
 {
     Q_ASSERT(context == m_context);
 
     switch (type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
     case PA_SUBSCRIPTION_EVENT_SINK:
         if ((type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
             m_sinks.removeEntry(index);
         } else {
             if (!PAOperation(pa_context_get_sink_info_by_index(context, index, sink_cb, this))) {
                 qCWarning(PLASMAPA) << "pa_context_get_sink_info_by_index() failed";
                 return;
             }
         }
         break;
 
     case PA_SUBSCRIPTION_EVENT_SOURCE:
         if ((type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
             m_sources.removeEntry(index);
         } else {
             if (!PAOperation(pa_context_get_source_info_by_index(context, index, source_cb, this))) {
                 qCWarning(PLASMAPA) << "pa_context_get_source_info_by_index() failed";
                 return;
             }
         }
         break;
 
     case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
         if ((type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
             m_sinkInputs.removeEntry(index);
         } else {
             if (!PAOperation(pa_context_get_sink_input_info(context, index, sink_input_callback, this))) {
                 qCWarning(PLASMAPA) << "pa_context_get_sink_input_info() failed";
                 return;
             }
         }
         break;
 
     case PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT:
         if ((type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
             m_sourceOutputs.removeEntry(index);
         } else {
             if (!PAOperation(pa_context_get_source_output_info(context, index, source_output_cb, this))) {
                 qCWarning(PLASMAPA) << "pa_context_get_sink_input_info() failed";
                 return;
             }
         }
         break;
 
     case PA_SUBSCRIPTION_EVENT_CLIENT:
         if ((type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
             m_clients.removeEntry(index);
         } else {
             if (!PAOperation(pa_context_get_client_info(context, index, client_cb, this))) {
                 qCWarning(PLASMAPA) << "pa_context_get_client_info() failed";
                 return;
             }
         }
         break;
 
     case PA_SUBSCRIPTION_EVENT_CARD:
         if ((type & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
             m_cards.removeEntry(index);
         } else {
             if (!PAOperation(pa_context_get_card_info_by_index(context, index, card_cb, this))) {
                 qCWarning(PLASMAPA) << "pa_context_get_card_info_by_index() failed";
                 return;
             }
         }
         break;
 
     case PA_SUBSCRIPTION_EVENT_SERVER:
         if (!PAOperation(pa_context_get_server_info(context, server_cb, this))) {
             qCWarning(PLASMAPA) << "pa_context_get_server_info() failed";
             return;
         }
         break;
 
     }
 }
 
 void Context::contextStateCallback(pa_context *c)
 {
     qCDebug(PLASMAPA) << "state callback";
     pa_context_state_t state = pa_context_get_state(c);
     if (state == PA_CONTEXT_READY) {
         qCDebug(PLASMAPA) << "ready";
 
         // 1. Register for the stream changes (except during probe)
         if (m_context == c) {
             pa_context_set_subscribe_callback(c, subscribe_cb, this);
 
             if (!PAOperation(pa_context_subscribe(c, (pa_subscription_mask_t)
                                            (PA_SUBSCRIPTION_MASK_SINK|
                                             PA_SUBSCRIPTION_MASK_SOURCE|
                                             PA_SUBSCRIPTION_MASK_CLIENT|
                                             PA_SUBSCRIPTION_MASK_SINK_INPUT|
                                             PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT|
                                             PA_SUBSCRIPTION_MASK_CARD|
                                             PA_SUBSCRIPTION_MASK_SERVER), nullptr, nullptr))) {
                 qCWarning(PLASMAPA) << "pa_context_subscribe() failed";
                 return;
             }
         }
 
         if (!PAOperation(pa_context_get_sink_info_list(c, sink_cb, this))) {
             qCWarning(PLASMAPA) << "pa_context_get_sink_info_list() failed";
             return;
         }
 
         if (!PAOperation(pa_context_get_source_info_list(c, source_cb, this))) {
             qCWarning(PLASMAPA) << "pa_context_get_source_info_list() failed";
             return;
         }
 
         if (!PAOperation(pa_context_get_client_info_list(c, client_cb, this))) {
             qCWarning(PLASMAPA) << "pa_context_client_info_list() failed";
             return;
         }
 
         if (!PAOperation(pa_context_get_card_info_list(c, card_cb, this))) {
             qCWarning(PLASMAPA) << "pa_context_get_card_info_list() failed";
             return;
         }
 
         if (!PAOperation(pa_context_get_sink_input_info_list(c, sink_input_callback, this))) {
             qCWarning(PLASMAPA) << "pa_context_get_sink_input_info_list() failed";
             return;
         }
 
         if (!PAOperation(pa_context_get_source_output_info_list(c, source_output_cb, this))) {
             qCWarning(PLASMAPA) << "pa_context_get_source_output_info_list() failed";
             return;
         }
 
         if (!PAOperation(pa_context_get_server_info(c, server_cb, this))) {
             qCWarning(PLASMAPA) << "pa_context_get_server_info() failed";
             return;
         }
 
         if (PAOperation(pa_ext_stream_restore_read(c, ext_stream_restore_read_cb, this))) {
             pa_ext_stream_restore_set_subscribe_cb(c, ext_stream_restore_subscribe_cb, this);
             PAOperation(pa_ext_stream_restore_subscribe(c, 1, nullptr, this));
         } else {
             qCWarning(PLASMAPA) << "Failed to initialize stream_restore extension";
         }
     } else if (!PA_CONTEXT_IS_GOOD(state)) {
         qCWarning(PLASMAPA) << "context kaput";
         if (m_context) {
             pa_context_unref(m_context);
             m_context = nullptr;
         }
         reset();
         QTimer::singleShot(1000, this, &Context::connectToDaemon);
     }
 }
 
 void Context::sinkCallback(const pa_sink_info *info)
 {
     // This parenting here is a bit weird
     m_sinks.updateEntry(info, this);
 }
 
 void Context::sinkInputCallback(const pa_sink_input_info *info)
 {
     m_sinkInputs.updateEntry(info, this);
 }
 
 void Context::sourceCallback(const pa_source_info *info)
 {
     m_sources.updateEntry(info, this);
 }
 
 void Context::sourceOutputCallback(const pa_source_output_info *info)
 {
     m_sourceOutputs.updateEntry(info, this);
 }
 
 void Context::clientCallback(const pa_client_info *info)
 {
     m_clients.updateEntry(info, this);
 }
 
 void Context::cardCallback(const pa_card_info *info)
 {
     m_cards.updateEntry(info, this);
 }
 
 void Context::streamRestoreCallback(const pa_ext_stream_restore_info *info)
 {
     if (qstrcmp(info->name, "sink-input-by-media-role:event") != 0) {
         return;
     }
 
     const int eventRoleIndex = 1;
     StreamRestore *obj = qobject_cast<StreamRestore *>(m_streamRestores.data().value(eventRoleIndex));
 
     if (!obj) {
         QVariantMap props;
         props.insert(QStringLiteral("application.icon_name"),
                      QStringLiteral("preferences-desktop-notification"));
         obj = new StreamRestore(eventRoleIndex, props, this);
         m_streamRestores.insert(obj);
     }
 
     obj->update(info);
 }
 
 void Context::serverCallback(const pa_server_info *info)
 {
     m_server->update(info);
 }
 
 void Context::setCardProfile(quint32 index, const QString &profile)
 {
     if (!m_context) {
         return;
     }
     qCDebug(PLASMAPA) << index << profile;
     if (!PAOperation(pa_context_set_card_profile_by_index(m_context,
                                                           index,
                                                           profile.toUtf8().constData(),
                                                           nullptr, nullptr))) {
         qCWarning(PLASMAPA) << "pa_context_set_card_profile_by_index failed";
         return;
     }
 }
 
 void Context::setDefaultSink(const QString &name)
 {
     if (!m_context) {
         return;
     }
     const QByteArray nameData = name.toUtf8();
     if (!PAOperation(pa_context_set_default_sink(m_context,
                                                  nameData.constData(),
                                                  nullptr,
                                                  nullptr))) {
         qCWarning(PLASMAPA) << "pa_context_set_default_sink failed";
     }
 }
 
 void Context::setDefaultSource(const QString &name)
 {
     if (!m_context) {
         return;
     }
     const QByteArray nameData = name.toUtf8();
     if (!PAOperation(pa_context_set_default_source(m_context,
                                                  nameData.constData(),
                                                  nullptr,
                                                  nullptr))) {
         qCWarning(PLASMAPA) << "pa_context_set_default_source failed";
     }
 }
 
 void Context::streamRestoreWrite(const pa_ext_stream_restore_info *info)
 {
     if (!m_context) {
         return;
     }
     if (!PAOperation(pa_ext_stream_restore_write(m_context,
                                                  PA_UPDATE_REPLACE,
                                                  info,
                                                  1,
                                                  true,
                                                  nullptr,
                                                  nullptr))) {
         qCWarning(PLASMAPA) << "pa_ext_stream_restore_write failed";
     }
 }
 
 void Context::connectToDaemon()
 {
     Q_ASSERT(m_context == nullptr);
 
     // We require a glib event loop
     if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) {
         qCWarning(PLASMAPA) << "Disabling PulseAudio integration for lack of GLib event loop";
         return;
     }
 
     qCDebug(PLASMAPA) <<  "Attempting connection to PulseAudio sound daemon";
     if (!m_mainloop) {
         m_mainloop = pa_glib_mainloop_new(nullptr);
         Q_ASSERT(m_mainloop);
     }
 
     pa_mainloop_api *api = pa_glib_mainloop_get_api(m_mainloop);
     Q_ASSERT(api);
     m_context = pa_context_new(api, "QPulse");
     Q_ASSERT(m_context);
 
     if (pa_context_connect(m_context, NULL, PA_CONTEXT_NOFAIL, nullptr) < 0) {
         pa_context_unref(m_context);
         pa_glib_mainloop_free(m_mainloop);
         m_context = nullptr;
         m_mainloop = nullptr;
         return;
     }
     pa_context_set_state_callback(m_context, &context_state_callback, this);
 }
 
 void Context::reset()
 {
     m_sinks.reset();
     m_sinkInputs.reset();
     m_sources.reset();
     m_sourceOutputs.reset();
     m_clients.reset();
     m_server->reset();
 }
 
 } // QPulseAudio