diff --git a/Makefile b/Makefile
index cd06ef4..1cddbd2 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ deb: build-arm
 	@install -Dm755 target/arm-unknown-linux-gnueabihf/release/sqlsprinkler-cli $(ROOT)/usr/bin/sqlsprinkler
 	@install -Dm755 conf/sqlsprinkler.conf $(ROOT)/etc/sqlsprinkler/sqlsprinkler.conf
 	@install -Dm755 systemd/sqlsprinkler-daemon.service $(ROOT)/lib/systemd/system/sqlsprinkler-daemon.service
+	@install -Dm755 systemd/sqlsprinkler-mqtt-daemon.service $(ROOT)/lib/systemd/system/sqlsprinkler-mqtt-daemon.service
 	@install -dm755 $(ROOT)/DEBIAN
 	@touch $(ROOT)/DEBIAN/control
 	@install -Dm755 conf/preinst $(ROOT)/DEBIAN/preinst
diff --git a/conf/sqlsprinkler.conf b/conf/sqlsprinkler.conf
index d6aac21..520023d 100644
--- a/conf/sqlsprinkler.conf
+++ b/conf/sqlsprinkler.conf
@@ -2,4 +2,8 @@ sqlsprinkler_user = 'changeme'
 sqlsprinkler_pass = 'changeme'
 sqlsprinkler_host = 'changeme'
 sqlsprinkler_db = 'changeme'
-verbose = false
\ No newline at end of file
+verbose = false
+mqtt_user = 'changeme'
+mqtt_pass = 'changeme'
+mqtt_host = 'changeme'
+mqtt_enabled = false
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 79b1ff0..90d14cf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -32,7 +32,7 @@ pub struct Opts {
     #[structopt(short = "w", long = "daemon", about = "Launches the SQLSprinkler API web daemon.")]
     daemon_mode: bool,
 
-    #[structopt(short = "ha", long = "home-assistant", about = "Broadcasts the current system to home assistant.")]
+    #[structopt(short = "m", long = "home-assistant", about = "Broadcasts the current system to home assistant.")]
     home_assistant: bool,
 
     #[structopt(subcommand)]
diff --git a/systemd/sqlsprinkler-mqtt-daemon.service b/systemd/sqlsprinkler-mqtt-daemon.service
new file mode 100644
index 0000000..93604cf
--- /dev/null
+++ b/systemd/sqlsprinkler-mqtt-daemon.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=MQTT Listener for SQLSprinkler
+After=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/sqlsprinkler -m
+Restart=on-failure
+RestartSec=3s
+User=pi
+Group=gpio
+
+[Install]
+WantedBy=multi-user.target