diff --git a/Makefile.am b/Makefile.am
index e56119de4..6009d7ba6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -287,6 +287,7 @@ ALSA_SOURCES = \
 if ENABLE_DBUS
 noinst_LIBRARIES += libodbus.a
 libodbus_a_SOURCES = \
+	src/lib/dbus/Init.hxx \
 	src/lib/dbus/AppendIter.hxx \
 	src/lib/dbus/AsyncRequest.hxx \
 	src/lib/dbus/Connection.cxx src/lib/dbus/Connection.hxx \
diff --git a/src/Main.cxx b/src/Main.cxx
index 5c933c4f2..9ab6c14c5 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -97,12 +97,12 @@
 #include "org_musicpd_Bridge.h"
 #endif
 
-#ifdef ENABLE_SYSTEMD_DAEMON
-#include <systemd/sd-daemon.h>
+#ifdef ENABLE_DBUS
+#include "lib/dbus/Init.hxx"
 #endif
 
-#ifdef ENABLE_DBUS
-#include <dbus/dbus.h>
+#ifdef ENABLE_SYSTEMD_DAEMON
+#include <systemd/sd-daemon.h>
 #endif
 
 #include <stdlib.h>
@@ -469,6 +469,10 @@ try {
 
 	const ScopeNetInit net_init;
 
+#ifdef ENABLE_DBUS
+	const ODBus::ScopeInit dbus_init;
+#endif
+
 	config_global_init();
 
 #ifdef ANDROID
@@ -708,11 +712,6 @@ try {
 
 	log_deinit();
 
-#ifdef ENABLE_DBUS
-	/* free libdbus memory to make memory leak checkers happy */
-	dbus_shutdown();
-#endif
-
 	return EXIT_SUCCESS;
 } catch (const std::exception &e) {
 	LogError(e);
diff --git a/src/lib/dbus/Init.hxx b/src/lib/dbus/Init.hxx
new file mode 100644
index 000000000..00a46d851
--- /dev/null
+++ b/src/lib/dbus/Init.hxx
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018 Max Kellermann <max.kellermann@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ODBUS_INIT_HXX
+#define ODBUS_INIT_HXX
+
+#include <dbus/dbus.h>
+
+namespace ODBus {
+
+class ScopeInit {
+public:
+	ScopeInit() = default;
+
+	~ScopeInit() noexcept {
+		/* free libdbus memory to make memory leak checkers happy */
+		dbus_shutdown();
+	}
+
+	ScopeInit(const ScopeInit &) = delete;
+	ScopeInit &operator=(const ScopeInit &) = delete;
+};
+
+} /* namespace ODBus */
+
+#endif