diff --git a/.gitmodules b/.gitmodules
index e69de29..befda3a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/mavlink"]
+	path = lib/mavlink
+	url = https://github.com/mavlink/c_library_v2.git
diff --git a/src/mavesp8266.h b/src/mavesp8266.h
index 6caa16e..27339d5 100644
--- a/src/mavesp8266.h
+++ b/src/mavesp8266.h
@@ -41,7 +41,9 @@
 #include <ESP8266WiFi.h>
 #include <WiFiClient.h>
 #include <WiFiUdp.h>
-#include <mavlink.h>
+
+#undef F
+#include <ardupilotmega/mavlink.h>
 
  extern "C" {
     // Espressif SDK
diff --git a/src/mavesp8266_component.cpp b/src/mavesp8266_component.cpp
index fe29c88..77c6001 100644
--- a/src/mavesp8266_component.cpp
+++ b/src/mavesp8266_component.cpp
@@ -299,7 +299,8 @@ MavESP8266Component::_handleCmdLong(MavESP8266Bridge* sender, mavlink_command_lo
             sender->_send_chan,
             &msg,
             cmd->command,
-            result
+            result,
+            0,0,0,0
         );
         sender->sendMessage(&msg);
     }