diff --git a/src/vscp/common/vscp-bootdevice-pic1.cpp b/src/vscp/common/vscp-bootdevice-pic1.cpp
index 548bf88b6..76c0f5731 100644
--- a/src/vscp/common/vscp-bootdevice-pic1.cpp
+++ b/src/vscp/common/vscp-bootdevice-pic1.cpp
@@ -228,7 +228,7 @@ CBootDevice_PIC1::deviceInfo(void)
 //
 
 int
-CBootDevice_PIC1::deviceInit(cguid& ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail)
+CBootDevice_PIC1::deviceInit(cguid& ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail)
 {
   int rv;
 
diff --git a/src/vscp/common/vscp-bootdevice-pic1.h b/src/vscp/common/vscp-bootdevice-pic1.h
index 735f2c3f8..aef815f98 100644
--- a/src/vscp/common/vscp-bootdevice-pic1.h
+++ b/src/vscp/common/vscp-bootdevice-pic1.h
@@ -186,7 +186,7 @@ class CBootDevice_PIC1 : public CBootDevice {
         MDF is not the same as the one read from the remote device.
       @return VSCP_ERROR_SUCCESS on success.
   */
-  int deviceInit(cguid& ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail = false);
+  int deviceInit(cguid& ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail = false);
 
   /*!
     Write a boot block to the device
diff --git a/src/vscp/common/vscp-bootdevice-vscp.cpp b/src/vscp/common/vscp-bootdevice-vscp.cpp
index 05b4b417e..7debb7abb 100644
--- a/src/vscp/common/vscp-bootdevice-vscp.cpp
+++ b/src/vscp/common/vscp-bootdevice-vscp.cpp
@@ -211,7 +211,7 @@ CBootDevice_VSCP::deviceInfo(void)
 //
 
 int
-CBootDevice_VSCP::deviceInit(cguid &ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail)
+CBootDevice_VSCP::deviceInit(cguid &ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail)
 {
   int rv;
   vscpEventEx ex;
diff --git a/src/vscp/common/vscp-bootdevice-vscp.h b/src/vscp/common/vscp-bootdevice-vscp.h
index d9a750a14..b8a354593 100644
--- a/src/vscp/common/vscp-bootdevice-vscp.h
+++ b/src/vscp/common/vscp-bootdevice-vscp.h
@@ -175,7 +175,7 @@ class CBootDevice_VSCP : public CBootDevice {
         MDF is not the same as the one read from the remote device.
       @return VSCP_ERROR_SUCCESS on success.
   */
-  int deviceInit(cguid &ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail = false);
+  int deviceInit(cguid &ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail = false);
 
   /*!
       Perform the actual firmware load process
diff --git a/src/vscp/common/vscp-bootdevice.h b/src/vscp/common/vscp-bootdevice.h
index 5e6e3a31d..b7aaada77 100644
--- a/src/vscp/common/vscp-bootdevice.h
+++ b/src/vscp/common/vscp-bootdevice.h
@@ -235,7 +235,7 @@ class CBootDevice {
         MDF is not the same as the one read from the remote device.
     @return VSCP_ERROR_SUCCESS on success.
   */
-  virtual int deviceInit(cguid &ourguid, uint8_t devicecode, bool bAbortOnFirmwareCodeFail = false) = 0;
+  virtual int deviceInit(cguid &ourguid, uint16_t devicecode, bool bAbortOnFirmwareCodeFail = false) = 0;
 
   /*!
     Perform the actual firmware load process
@@ -272,12 +272,12 @@ class CBootDevice {
 
   /*!
     The device code tell the type of hardware of the remote device
-    Must be the same as the firmware we try to load is intended for.
+    Must/should be the same as for the firmware we try to load.
 
     Some (old) devices will have this code set to 0 in this cae no check
     should be performed.
   */
-  uint8_t m_firmwaredeviceCode;
+  uint16_t m_firmwaredeviceCode;
 
   /// Our local GUID
   cguid m_ourguid;