diff --git a/avr/devices/n16/0BUILD b/avr/devices/n16/0BUILD
index be449f6..e54b57e 100644
--- a/avr/devices/n16/0BUILD
+++ b/avr/devices/n16/0BUILD
@@ -7,6 +7,10 @@
     main
   </subdirs>
 
+  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
+    aqua_n16.xml
+  </data>
+
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/n16/aqua_n16.xml b/avr/devices/n16/aqua_n16.xml
new file mode 100644
index 0000000..6a574de
--- /dev/null
+++ b/avr/devices/n16/aqua_n16.xml
@@ -0,0 +1,17 @@
+
+<device name="aqua_n16" driver="nodes">
+  <manufacturer>AQUA</manufacturer>
+  <devicetype>N</devicetype>
+  <deviceversion>16</deviceversion>
+  
+  <values>
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="DOOR"                   id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />
+
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
+    
+  </values>
+
+</device>
diff --git a/avr/devices/t03/0BUILD b/avr/devices/t03/0BUILD
index c1b8f79..ba832c8 100644
--- a/avr/devices/t03/0BUILD
+++ b/avr/devices/t03/0BUILD
@@ -9,6 +9,10 @@
     uartfd
   </subdirs>
 
+  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
+    aqua_t03.xml
+  </data>
+
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/t03/aqua_t03.xml b/avr/devices/t03/aqua_t03.xml
new file mode 100644
index 0000000..3d539ca
--- /dev/null
+++ b/avr/devices/t03/aqua_t03.xml
@@ -0,0 +1,13 @@
+
+<device name="aqua_t03" driver="nodes">
+  <manufacturer>AQUA</manufacturer>
+  <devicetype>T</devicetype>
+  <deviceversion>3</deviceversion>
+  
+  <values>
+    <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
+
+    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+  </values>
+
+</device>
diff --git a/devices/nodes/0BUILD b/devices/nodes/0BUILD
index 4c7b1e3..ed2e335 100644
--- a/devices/nodes/0BUILD
+++ b/devices/nodes/0BUILD
@@ -6,13 +6,11 @@
     aqua_n11.xml
     aqua_n12.xml
     aqua_n15.xml
-    aqua_n16.xml
     aqua_n17.xml
     aqua_n18.xml
     aqua_n19.xml
     aqua_n20.xml
     aqua_n22.xml
-    aqua_t03.xml
   </data>
 
 </gwbuild>
diff --git a/devices/nodes/aqua_n16.xml b/devices/nodes/aqua_n16.xml
deleted file mode 100644
index 4f18f70..0000000
--- a/devices/nodes/aqua_n16.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<device name="aqua_n16" driver="nodes">
-  <manufacturer>AQUA</manufacturer>
-  <devicetype>N</devicetype>
-  <deviceversion>16</deviceversion>
-  
-  <values>
-    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
-    <value name="DOOR"                   id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />
-
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
-    
-  </values>
-
-</device>
diff --git a/devices/nodes/aqua_t03.xml b/devices/nodes/aqua_t03.xml
deleted file mode 100644
index 1ca7901..0000000
--- a/devices/nodes/aqua_t03.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<device name="aqua_t03" driver="nodes">
-  <manufacturer>AQUA</manufacturer>
-  <devicetype>T</devicetype>
-  <deviceversion>3</deviceversion>
-  
-  <values>
-    <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
-
-    <value name="stats_packets_in"        id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"       id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"    id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"         id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"      id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors"  id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"       id="0xe6" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors"    id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors"     id="0xe8" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="stats_packets_in2"       id="0xe9" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out2"      id="0xea" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors2"   id="0xeb" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors2"        id="0xec" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors2"     id="0xed" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors2" id="0xee" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors2"      id="0xef" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_msgsize_errors2"   id="0xf0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_missed_errors2"    id="0xf1" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
-  </values>
-
-</device>