diff --git a/src/Settings/AutoConnect.SettingsGroup.json b/src/Settings/AutoConnect.SettingsGroup.json
index f4a812c..eef97e9 100644
--- a/src/Settings/AutoConnect.SettingsGroup.json
+++ b/src/Settings/AutoConnect.SettingsGroup.json
@@ -60,6 +60,13 @@
     "default":     4800
 },
 {
+    "name":             "autoConnectZeroConf",
+    "shortDesc": "Automatically open a connection with Zero-Conf",
+    "longDesc":  "If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.",
+    "type":             "bool",
+    "default":     true
+},
+{
     "name":             "udpListenPort",
     "shortDesc": "UDP port for autoconnect",
     "type":             "uint32",
diff --git a/src/Settings/AutoConnectSettings.cc b/src/Settings/AutoConnectSettings.cc
index 6c70050..ad1160f 100644
--- a/src/Settings/AutoConnectSettings.cc
+++ b/src/Settings/AutoConnectSettings.cc
@@ -100,3 +100,14 @@ DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectNmeaBaud)
     }
     return _autoConnectNmeaBaudFact;
 }
+
+DECLARE_SETTINGSFACT_NO_FUNC(AutoConnectSettings, autoConnectZeroConf)
+{
+    if (!_autoConnectZeroConfFact) {
+        _autoConnectZeroConfFact = _createSettingsFact(autoConnectZeroConfName);
+#ifdef __ios__
+        _autoConnectZeroConfFact->setVisible(false);
+#endif
+    }
+    return _autoConnectZeroConfFact;
+}
diff --git a/src/Settings/AutoConnectSettings.h b/src/Settings/AutoConnectSettings.h
index e8df538..cd631da 100644
--- a/src/Settings/AutoConnectSettings.h
+++ b/src/Settings/AutoConnectSettings.h
@@ -33,6 +33,7 @@ public:
     DEFINE_SETTINGFACT(autoConnectLibrePilot)
     DEFINE_SETTINGFACT(autoConnectNmeaPort)
     DEFINE_SETTINGFACT(autoConnectNmeaBaud)
+    DEFINE_SETTINGFACT(autoConnectZeroConf)
     DEFINE_SETTINGFACT(udpListenPort)
     DEFINE_SETTINGFACT(udpTargetHostIP)
     DEFINE_SETTINGFACT(udpTargetHostPort)