diff --git a/com.zsmartsystems.zigbee.dongle.ember.autocode/src/main/java/com/zsmartsystems/zigbee/dongle/ember/autocode/CommandGenerator.java b/com.zsmartsystems.zigbee.dongle.ember.autocode/src/main/java/com/zsmartsystems/zigbee/dongle/ember/autocode/CommandGenerator.java
index a6e188705..677571432 100644
--- a/com.zsmartsystems.zigbee.dongle.ember.autocode/src/main/java/com/zsmartsystems/zigbee/dongle/ember/autocode/CommandGenerator.java
+++ b/com.zsmartsystems.zigbee.dongle.ember.autocode/src/main/java/com/zsmartsystems/zigbee/dongle/ember/autocode/CommandGenerator.java
@@ -978,7 +978,7 @@ private void createEmberFrame(Protocol protocol) throws FileNotFoundException, U
         out.println("    /**");
         out.println("     * The maximum supported version of EZSP");
         out.println("     */");
-        out.println("    public static final int EZSP_MAX_VERSION = 11;");
+        out.println("    public static final int EZSP_MAX_VERSION = 12;");
         out.println();
         out.println("    /**");
         out.println("     * The network ID bit shift");
diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrame.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrame.java
index 3353b0b24..d83610335 100644
--- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrame.java
+++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrame.java
@@ -58,7 +58,7 @@ public abstract class EzspFrame {
     /**
      * The maximum supported version of EZSP
      */
-    public static final int EZSP_MAX_VERSION = 11;
+    public static final int EZSP_MAX_VERSION = 12;
 
     /**
      * The network ID bit shift
diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java
index f65aac367..5d3236d0a 100644
--- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java
+++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java
@@ -127,8 +127,10 @@ public void testEzspVersions() {
         assertEquals(10, EzspFrame.getEzspVersion());
         assertTrue(EzspFrame.setEzspVersion(11));
         assertEquals(11, EzspFrame.getEzspVersion());
-        assertFalse(EzspFrame.setEzspVersion(12));
-        assertEquals(11, EzspFrame.getEzspVersion());
+        assertTrue(EzspFrame.setEzspVersion(12));
+        assertEquals(12, EzspFrame.getEzspVersion());
+        assertFalse(EzspFrame.setEzspVersion(13));
+        assertEquals(12, EzspFrame.getEzspVersion());
         EzspFrame.setEzspVersion(4);
     }