diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 5d6ba4b7..0cae9ee2d 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -726,6 +726,9 @@
     "portsFunction_TELEMETRY_LTM": {
         "message": "LTM"
     },
+    "portsFunction_TELEMETRY_MAVLINK": {
+        "message": "MAVLink"
+    },
     "portsFunction_TELEMETRY_MSP": {
         "message": "MSP"
     },
diff --git a/js/msp.js b/js/msp.js
index 4b8dbabb..cc6bf10a 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -150,6 +150,7 @@ var MSP = {
             'TELEMETRY_SMARTPORT': 5,
             'RX_SERIAL': 6,
             'BLACKBOX': 7,
+            'TELEMETRY_MAVLINK': 8,
         },
 
     read: function (readInfo) {
diff --git a/tabs/ports.js b/tabs/ports.js
index 23d48fcd..0efec801 100644
--- a/tabs/ports.js
+++ b/tabs/ports.js
@@ -25,6 +25,11 @@ TABS.ports.initialize = function (callback, scrollPosition) {
         functionRules.push(mspFunctionRule);
     }
 
+    if (semver.gte(CONFIG.apiVersion, "1.18.0")) {
+        var mavlinkFunctionRule = {name: 'TELEMETRY_MAVLINK',    groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['blackbox'], maxPorts: 1};
+        functionRules.push(mavlinkFunctionRule);
+    }
+
     for (var i = 0; i < functionRules.length; i++) {
         functionRules[i].displayName = chrome.i18n.getMessage('portsFunction_' + functionRules[i].name);
     }