diff --git a/0BUILD b/0BUILD
index 954faa9..89ef4cb 100644
--- a/0BUILD
+++ b/0BUILD
@@ -166,6 +166,7 @@
       aqhome
       apps
       devices
+      etc
     </subdirs>
 
     <ifVarMatches name="option_with_avr" value="TRUE" >
diff --git a/etc/0BUILD b/etc/0BUILD
new file mode 100644
index 0000000..28c5ed7
--- /dev/null
+++ b/etc/0BUILD
@@ -0,0 +1,15 @@
+<?xml?>
+
+<gwbuild>
+
+  <data dist="true">
+    aqhome-data.service
+    aqhome-mqttlog.service
+    aqhome-nodes.service
+  </data>
+
+  <data dist="true" install="$(sysconfdir)">
+    aqhome.conf.example
+  </data>
+
+</gwbuild>
diff --git a/etc/aqhome-mqttlog.service b/etc/aqhome-mqttlog.service
index 9f4b90b..8be7572 100644
--- a/etc/aqhome-mqttlog.service
+++ b/etc/aqhome-mqttlog.service
@@ -6,7 +6,7 @@ Wants=aqhome-mqttlog.service
 [Service]
 Type=exec
 RemainAfterExit=no
-ExecStart=/usr/local/bin/aqhome-mqttlog -ma 192.168.117.192 -mp 1883 -W /var/cache/aqhome/mqttlog -i /usr/local/etc/mqttlog.conf -p /var/run/aqhome-mqttlog.pid -T 0
+ExecStart=/usr/local/bin/aqhome-mqttlog -p /var/run/aqhome-mqttlog.pid -T 0
 
 [Install]
 WantedBy=multi-user.target
diff --git a/etc/aqhome-nodes.service b/etc/aqhome-nodes.service
new file mode 100644
index 0000000..00f20ed
--- /dev/null
+++ b/etc/aqhome-nodes.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=AqHome Nodes Service
+DefaultDependencies=no
+Wants=aqhome-data.service
+
+[Service]
+Type=exec
+RemainAfterExit=no
+ExecStart=/usr/local/bin/aqhome-nodes -p /var/run/aqhome-nodes.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/etc/aqhome.conf b/etc/aqhome.conf.example
similarity index 100%
rename from etc/aqhome.conf
rename to etc/aqhome.conf.example
diff --git a/etc/aqhomed.service b/etc/aqhomed.service
deleted file mode 100644
index 4b47d88..0000000
--- a/etc/aqhomed.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=AqHome DAEMON
-DefaultDependencies=no
-Wants=network.target
-
-[Service]
-Type=exec
-RemainAfterExit=no
-# ExecStart=/usr/local/sbin/aqhomed -l /var/log/aqhome.log -db /var/cache/aqhome/nodes.db -ma 192.168.117.192 -mp 1883 -t 0.0.0.0 -W /var/cache/aqhome -p /var/run/aqhome.pid
-ExecStart=/usr/local/sbin/aqhomed -l /var/log/aqhome.log -db /var/cache/aqhome/nodes.db -ma 192.168.117.192 -mp 1883 -t 0.0.0.0 -p /var/run/aqhome.pid
-
-[Install]
-WantedBy=multi-user.target