diff --git a/ASLUAV/version.h b/ASLUAV/version.h
index d868569..3041e20 100644
--- a/ASLUAV/version.h
+++ b/ASLUAV/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  
diff --git a/ardupilotmega/version.h b/ardupilotmega/version.h
index 4ffc611..30b487d 100644
--- a/ardupilotmega/version.h
+++ b/ardupilotmega/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  
diff --git a/autoquad/version.h b/autoquad/version.h
index 576848f..e8b90ad 100644
--- a/autoquad/version.h
+++ b/autoquad/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  
diff --git a/common/common.h b/common/common.h
index 1d74719..1ec8c35 100644
--- a/common/common.h
+++ b/common/common.h
@@ -194,7 +194,8 @@ typedef enum MAV_STATE
    MAV_STATE_CRITICAL=5, /* System is in a non-normal flight mode. It can however still navigate. | */
    MAV_STATE_EMERGENCY=6, /* System is in a non-normal flight mode. It lost control over parts or over the whole airframe. It is in mayday and going down. | */
    MAV_STATE_POWEROFF=7, /* System just initialized its power-down sequence, will shut down now. | */
-   MAV_STATE_ENUM_END=8, /*  | */
+   MAV_STATE_FLIGHT_TERMINATION=8, /* System is terminating itself. | */
+   MAV_STATE_ENUM_END=9, /*  | */
 } MAV_STATE;
 #endif
 
diff --git a/common/version.h b/common/version.h
index 4dfcae2..ee930b8 100644
--- a/common/version.h
+++ b/common/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  
diff --git a/matrixpilot/version.h b/matrixpilot/version.h
index 1fc9184..1a43a46 100644
--- a/matrixpilot/version.h
+++ b/matrixpilot/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  
diff --git a/message_definitions/common.xml b/message_definitions/common.xml
index 52c703b..2ee72c6 100644
--- a/message_definitions/common.xml
+++ b/message_definitions/common.xml
@@ -300,6 +300,9 @@
       <entry name="MAV_STATE_POWEROFF">
         <description>System just initialized its power-down sequence, will shut down now.</description>
       </entry>
+      <entry name="MAV_STATE_FLIGHT_TERMINATION">
+        <description>System is terminating itself.</description>
+      </entry>
     </enum>
     <enum name="MAV_COMPONENT">
       <entry value="0" name="MAV_COMP_ID_ALL">
diff --git a/minimal/version.h b/minimal/version.h
index a7de4cd..bfc2083 100644
--- a/minimal/version.h
+++ b/minimal/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9
  
diff --git a/slugs/version.h b/slugs/version.h
index cc51588..1a31c38 100644
--- a/slugs/version.h
+++ b/slugs/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  
diff --git a/standard/version.h b/standard/version.h
index 56e8a83..67d239e 100644
--- a/standard/version.h
+++ b/standard/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
  
diff --git a/test/version.h b/test/version.h
index e969d53..08bceb8 100644
--- a/test/version.h
+++ b/test/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
  
diff --git a/uAvionix/version.h b/uAvionix/version.h
index 5fabc92..0df017f 100644
--- a/uAvionix/version.h
+++ b/uAvionix/version.h
@@ -7,7 +7,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Sun Jul 30 2017"
+#define MAVLINK_BUILD_DATE "Sat Aug 05 2017"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255