diff --git a/Makefile.am b/Makefile.am
index 30f8be36..f2488188 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,12 +12,12 @@ EXTRA_DIST = LICENSE \
 	VERSION
 
 if MQTT
-MQTT_INST_ADD = mkdir -p $(DESTDIR)/etc/ebusd/; \
-	cp -n $(srcdir)/contrib/etc/ebusd/mqtt-*.cfg $(DESTDIR)/etc/ebusd
+MQTT_INST_ADD = cp -n $(srcdir)/contrib/etc/ebusd/mqtt-*.cfg $(DESTDIR)$(sysconfdir)/ebusd
 endif
 
 install-data-hook:
-	@if [ -f "/etc/debian_version" ]; then \
+	@[ -d $(DESTDIR)$(sysconfdir)/ebusd ] || mkdir -p $(DESTDIR)$(sysconfdir)/ebusd; \
+	if [ -f "/etc/debian_version" ]; then \
 	  mkdir -p $(DESTDIR)/etc/default/ $(DESTDIR)/etc/init.d/ $(DESTDIR)/lib/systemd/system/; \
 	  cp -n $(srcdir)/contrib/debian/default/ebusd $(DESTDIR)/etc/default/; \
 	  cp $(srcdir)/contrib/debian/init.d/ebusd $(DESTDIR)/etc/init.d/; \
diff --git a/make_debian.sh b/make_debian.sh
index 2c696716..cb8d1f94 100755
--- a/make_debian.sh
+++ b/make_debian.sh
@@ -140,7 +140,7 @@ EOF
 cat <<EOF > $RELEASE/DEBIAN/conffiles
 /etc/default/ebusd
 EOF
-if [ -d "$RELEASE/etc/ebusd" ]; then
+if ls $RELEASE/etc/ebusd/* >/dev/null 2>&1 ; then
   echo '/etc/ebusd' >> $RELEASE/DEBIAN/dirs
   (cd $RELEASE && for i in etc/ebusd/*; do echo "/$i"; done) >> $RELEASE/DEBIAN/conffiles
 fi
diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am
index 0ecbf5a2..12064bd7 100644
--- a/src/ebusd/Makefile.am
+++ b/src/ebusd/Makefile.am
@@ -37,6 +37,3 @@ endif
 distclean-local:
 	-rm -f Makefile.in
 	-rm -rf .libs
-
-install-data-local:
-	[ -d $(DESTDIR)$(sysconfdir)/ebusd ] || mkdir -p $(DESTDIR)$(sysconfdir)/ebusd