diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index a13af882e2..0e618b72e6 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -136,6 +136,7 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[] = {
                                          NM_SETTING_BRIDGE_PORT_SETTING_NAME","\
                                          NM_SETTING_TEAM_SETTING_NAME","\
                                          NM_SETTING_TEAM_PORT_SETTING_NAME"," \
+                                         NM_SETTING_OVS_PATCH_SETTING_NAME","\
                                          NM_SETTING_DCB_SETTING_NAME"," \
                                          NM_SETTING_TUN_SETTING_NAME"," \
                                          NM_SETTING_IP_TUNNEL_SETTING_NAME"," \
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 4e90c42643..cf1d82a1f1 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -5803,6 +5803,15 @@ static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
 	NULL
 };
 
+#undef  _CURRENT_NM_META_SETTING_TYPE
+#define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_PATCH
+static const NMMetaPropertyInfo *const property_infos_OVS_PATCH[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PATCH_PEER,
+		.property_type =                &_pt_gobject_string,
+	),
+	NULL
+};
+
 #undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPP
 static const NMMetaPropertyInfo *const property_infos_PPP[] = {
@@ -6722,6 +6731,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 #define SETTING_PRETTY_NAME_MACSEC              N_("MACsec connection")
 #define SETTING_PRETTY_NAME_MACVLAN             N_("macvlan connection")
 #define SETTING_PRETTY_NAME_OLPC_MESH           N_("OLPC Mesh connection")
+#define SETTING_PRETTY_NAME_OVS_PATCH           N_("OpenVSwitch patch interface settings")
 #define SETTING_PRETTY_NAME_PPP                 N_("PPP settings")
 #define SETTING_PRETTY_NAME_PPPOE               N_("PPPoE")
 #define SETTING_PRETTY_NAME_PROXY               N_("Proxy")
@@ -6871,6 +6881,7 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
 		),
 		.setting_init_fcn =             _setting_init_fcn_olpc_mesh,
 	),
+	SETTING_INFO (OVS_PATCH),
 	SETTING_INFO (PPPOE,
 		/* PPPoE is a base connection type from historical reasons.
 		 * See libnm-core/nm-setting.c:_nm_setting_is_base_type()
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index 7e4e8e08a4..6aa40b6f7d 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -76,6 +76,7 @@
 #include "nm-setting-macsec.h"
 #include "nm-setting-macvlan.h"
 #include "nm-setting-olpc-mesh.h"
+#include "nm-setting-ovs-patch.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
 #include "nm-setting-proxy.h"
diff --git a/shared/nm-meta-setting.c b/shared/nm-meta-setting.c
index 3730bb8925..b44becd2d0 100644
--- a/shared/nm-meta-setting.c
+++ b/shared/nm-meta-setting.c
@@ -43,6 +43,7 @@
 #include "nm-setting-macsec.h"
 #include "nm-setting-macvlan.h"
 #include "nm-setting-olpc-mesh.h"
+#include "nm-setting-ovs-patch.h"
 #include "nm-setting-ppp.h"
 #include "nm-setting-pppoe.h"
 #include "nm-setting-proxy.h"
@@ -235,6 +236,11 @@ const NMMetaSettingInfo nm_meta_setting_infos[] = {
 		.setting_name =             NM_SETTING_OLPC_MESH_SETTING_NAME,
 		.get_setting_gtype =        nm_setting_olpc_mesh_get_type,
 	},
+	[NM_META_SETTING_TYPE_OVS_PATCH] = {
+		.meta_type =                NM_META_SETTING_TYPE_OVS_PATCH,
+		.setting_name =             NM_SETTING_OVS_PATCH_SETTING_NAME,
+		.get_setting_gtype =        nm_setting_ovs_patch_get_type,
+	},
 	[NM_META_SETTING_TYPE_PPPOE] = {
 		.meta_type =                NM_META_SETTING_TYPE_PPPOE,
 		.setting_name =             NM_SETTING_PPPOE_SETTING_NAME,
diff --git a/shared/nm-meta-setting.h b/shared/nm-meta-setting.h
index 949a6920c6..6c2ba2f7a6 100644
--- a/shared/nm-meta-setting.h
+++ b/shared/nm-meta-setting.h
@@ -75,6 +75,7 @@ typedef enum {
 	NM_META_SETTING_TYPE_MACSEC,
 	NM_META_SETTING_TYPE_MACVLAN,
 	NM_META_SETTING_TYPE_OLPC_MESH,
+	NM_META_SETTING_TYPE_OVS_PATCH,
 	NM_META_SETTING_TYPE_PPP,
 	NM_META_SETTING_TYPE_PPPOE,
 	NM_META_SETTING_TYPE_PROXY,