diff --git a/libraries/GCS_MAVLink/VERSION b/libraries/GCS_MAVLink/VERSION
index af0b7ddbffd5d5a877581ba8ba10deed158da14d..238d6e882a08cec91c9bf37bd210147a0c968798 100644
--- a/libraries/GCS_MAVLink/VERSION
+++ b/libraries/GCS_MAVLink/VERSION
@@ -1 +1 @@
-1.0.6
+1.0.7
diff --git a/libraries/GCS_MAVLink/include/mavlink/config.h b/libraries/GCS_MAVLink/include/mavlink/config.h
index a1fb99f0f03e96e1c36a176374b3dabbb2c83875..db7db0d7d695066612908f0dd1a3f1490a238685 100644
--- a/libraries/GCS_MAVLink/include/mavlink/config.h
+++ b/libraries/GCS_MAVLink/include/mavlink/config.h
@@ -1 +1 @@
-#define MAVLINK_VERSION "1.0.6"
+#define MAVLINK_VERSION "1.0.7"
diff --git a/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/version.h b/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/version.h
index fe53ad26005f7768d8d9603c5b66286c7e86cf44..cbf2f9b1ed5fecfa40ce4d98e7595ca966fa9aa9 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v0.9/ardupilotmega/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Thu Apr 19 15:39:52 2012"
+#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:46 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/include/mavlink/v0.9/common/version.h b/libraries/GCS_MAVLink/include/mavlink/v0.9/common/version.h
index 699dc654b3461d6bb2ff1182c2bf673862539166..5ca3dc8ca3f75f3194c97689458105b76ccde82f 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v0.9/common/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v0.9/common/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Thu Apr 19 15:40:00 2012"
+#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:54 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h
index 05c9919baafafda10de4d791c6353b2c2f1d9a33..7cc3ee13d9727a407171b783fe8532bf79600cf8 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Thu Apr 19 15:39:53 2012"
+#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:47 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h
index b5658657de42511619bcae6d17e202bba8c393b9..0e49f8232ed82b3812bc519d72af4fe90af494bd 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/common/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Thu Apr 19 15:40:01 2012"
+#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:54 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/matrixpilot/version.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/matrixpilot/version.h
index 425926f23c7cb788f9d23fb7dbdaae5b378ca586..1afb38ab6750f141c2936b442806072bf65c2135 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/matrixpilot/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/matrixpilot/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Thu Apr 19 15:39:55 2012"
+#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:49 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_types.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_types.h
index 16e32ae635982c1e62a62dd298224b417a122fd5..5fbde97f7363ad203981483c7bf88828e4bf5faf 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_types.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_types.h
@@ -18,9 +18,12 @@
 #define MAVLINK_MSG_ID_EXTENDED_MESSAGE 255
 #define MAVLINK_EXTENDED_HEADER_LEN 14
 
-#define MAVLINK_MAX_EXTENDED_PACKET_LEN 65507
-#if (MAVLINK_MAX_EXTENDED_PACKET_LEN > __WCHAR_MAX__)
-#define MAVLINK_MAX_EXTENDED_PACKET_LEN __WCHAR_MAX__
+#if (defined _MSC_VER) | ((defined __APPLE__) & (defined __MACH__)) | (defined __linux__)
+  /* full fledged 32bit++ OS */
+  #define MAVLINK_MAX_EXTENDED_PACKET_LEN 65507
+#else
+  /* small microcontrollers */
+  #define MAVLINK_MAX_EXTENDED_PACKET_LEN 2048
 #endif
 
 #define MAVLINK_MAX_EXTENDED_PAYLOAD_LEN (MAVLINK_MAX_EXTENDED_PACKET_LEN - MAVLINK_EXTENDED_HEADER_LEN - MAVLINK_NUM_NON_PAYLOAD_BYTES)
diff --git a/libraries/GCS_MAVLink/include/mavlink/v1.0/sensesoar/version.h b/libraries/GCS_MAVLink/include/mavlink/v1.0/sensesoar/version.h
index 7874a44b668bc6fccdc62055342b8ae4f2c16b97..f2a254a51628b7afa3020b29c56dae1385220b07 100644
--- a/libraries/GCS_MAVLink/include/mavlink/v1.0/sensesoar/version.h
+++ b/libraries/GCS_MAVLink/include/mavlink/v1.0/sensesoar/version.h
@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Thu Apr 19 15:39:58 2012"
+#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:51 2012"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
  
diff --git a/libraries/GCS_MAVLink/update b/libraries/GCS_MAVLink/update
index 7e22a08c628b9f6e0d5d216b65e913e4be0cc9bc..36dd19d04663867dce19bc5b17d868a676e4c9a0 100755
--- a/libraries/GCS_MAVLink/update
+++ b/libraries/GCS_MAVLink/update
@@ -7,7 +7,7 @@ fi
 
 MAVLINK_VERSION=$1
 rm -rf  VERSION mavlink* include lib share *.zip
-wget https://github.com/downloads/mavlink/mavlink/mavlink-${MAVLINK_VERSION}.zip
+wget http://github.com/downloads/mavlink/mavlink/mavlink-${MAVLINK_VERSION}.zip
 unzip mavlink-${MAVLINK_VERSION}.zip
 mv mavlink-${MAVLINK_VERSION}/* .
 rm -rf  mavlink* share lib