diff --git a/avr/att84_base.asm b/avr/att84_base.asm
index 3cc25bb..25ddee9 100644
--- a/avr/att84_base.asm
+++ b/avr/att84_base.asm
@@ -138,6 +138,7 @@
 
 firmwareType:    .dw FW_TYPE
 firmwareVersion: .dw FW_VERSION
+firmwareModules: .dw MODULES_MASK
 firmwareStart:   .dw 0 ; will be overwritten when flashing
 
 
diff --git a/avr/att84_temp1.asm b/avr/att84_temp1.asm
index d6e3c24..f70787e 100644
--- a/avr/att84_temp1.asm
+++ b/avr/att84_temp1.asm
@@ -196,6 +196,7 @@
 
 firmwareType:    .dw FW_TYPE
 firmwareVersion: .dw FW_VERSION
+firmwareModules: .dw MODULES_MASK
 firmwareStart:
   rjmp main
 
@@ -222,6 +223,7 @@ firmwareStart:
     .include "comproto_memstats.asm"
     .include "comproto_pong.asm"
     .include "comproto_values.asm"
+    .include "comproto_device.asm"
   #endif
 #endif
 #ifdef MODULES_TWI_MASTER
diff --git a/avr/flashproto.asm b/avr/flashproto.asm
index cf36f8c..b70b85a 100644
--- a/avr/flashproto.asm
+++ b/avr/flashproto.asm
@@ -403,13 +403,13 @@ flashWriteFlashReady:
   st X+, r16
   lds r16, flashUid+3
   st X+, r16
-  ldi r16, LOW(firmwareType)
+  lds r16, firmwareType
   st X+, r16
-  ldi r16, HIGH(firmwareType)
+  lds r16, firmwareType+1
   st X+, r16
-  ldi r16, LOW(firmwareVersion)
+  lds r16, firmwareVersion
   st X+, r16
-  ldi r16, HIGH(firmwareVersion)
+  lds r16, firmwareVersion+1
   st X+, r16
   ldi r16, LOW(PAGESIZE*2)
   st X+, r16