diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 61ce4a43bd5ea3169423e02fd75b5c418079f1fb..9059a998860a53b408a0e1c6c7daf554b049598c 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -19,7 +19,11 @@ unittest:
 endif
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src ringtones man $(TESTS_DIR) doc bin
+SUBDIRS = src ringtones man $(TESTS_DIR) doc
+
+if SFL_DBUS
+SUBDIRS += bin
+endif
 
 EXTRA_DIST = m4/libtool.m4 \
 			 m4/lt~obsolete.m4 \
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 699879dedb741a910254cdb6eaf0cc5072b11fed..464e5a1202e6adf692619b64651bcb2df2d6240c 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -264,7 +264,9 @@ AS_IF([test "x$with_dbus" = "xyes"], [
        AS_IF([test "x$CLANG" = "xyes"], [
              AC_MSG_ERROR([dbus does not compile when clang is used, rerun with --without-dbus])
        ]);
-]);
+
+       AM_CONDITIONAL(SFL_DBUS, true)],
+       AM_CONDITIONAL(SFL_DBUS, false));
 
 
 dnl Video is default-enabled