diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index d1122af8fdd9..30e9abf2c49c 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -1,57 +1,57 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 
 PORTNAME=	openvswitch
-DISTVERSION=	2.16.2
+DISTVERSION=	2.17.0
 CATEGORIES=	net
 MASTER_SITES=	http://openvswitch.org/releases/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Production quality, multilayer virtual switch
 
 LICENSE=	APACHE20
 
 BROKEN_mips64=		fails to compile: ofp-actions.h:486: flexible array member in otherwise empty struct
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig python \
 		shebangfix ssl
 SHEBANG_FILES=	ipsec/ovs-monitor-ipsec.in \
 		utilities/bugtool/ovs-bugtool-get-port-stats \
 		utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \
 		utilities/bugtool/ovs-bugtool.in \
 		utilities/ovs-appctl-bashcomp.bash \
 		utilities/ovs-check-dead-ifs.in \
 		utilities/ovs-docker \
 		utilities/ovs-dpctl-top.in \
 		utilities/ovs-l3ping.in \
 		utilities/ovs-parse-backtrace.in \
 		utilities/ovs-pcap.in \
 		utilities/ovs-tcpdump.in  \
 		utilities/ovs-tcpundump.in \
 		utilities/ovs-test.in \
 		utilities/ovs-vlan-test.in \
 		vtep/ovs-vtep.in
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static --localstatedir=/var \
 		--with-dbdir=/var/db/${PORTNAME} \
 		--with-openssl=${OPENSSLBASE}
 USE_RC_SUBR=	ovs-vswitchd ovsdb-server
 LDFLAGS+=	-lpthread
 INSTALL_TARGET=install-strip
 
 SHLIB_VER=	${DISTVERSION:C/\.[0-9]*$//}
 PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|uuid_from_string(|uuid_from_string_ovs(|g' \
 		${WRKSRC}/*/*.c ${WRKSRC}/*/*.h
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/run/openvswitch
 	${MKDIR} ${STAGEDIR}/var/log/openvswitch
 	${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/
 
 .include <bsd.port.mk>
diff --git a/net/openvswitch/distinfo b/net/openvswitch/distinfo
index ab31ab9de25c..24903b7b47c3 100644
--- a/net/openvswitch/distinfo
+++ b/net/openvswitch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640576155
-SHA256 (openvswitch-2.16.2.tar.gz) = 03ac4c3299b38e56c0b4d4c27a329c958b003a08f3b548a0a3ca8b994f2d4934
-SIZE (openvswitch-2.16.2.tar.gz) = 7605157
+TIMESTAMP = 1645205990
+SHA256 (openvswitch-2.17.0.tar.gz) = e03bfab7ca82d81a7d3a36de4f390a3b5210e3f39657671f922877cd4ea6dc73
+SIZE (openvswitch-2.17.0.tar.gz) = 7729001
diff --git a/net/openvswitch/pkg-plist b/net/openvswitch/pkg-plist
index 45cbcc2f343a..fc0a5bbcf67d 100644
--- a/net/openvswitch/pkg-plist
+++ b/net/openvswitch/pkg-plist
@@ -1,192 +1,192 @@
 bin/ovs-appctl
 bin/ovs-docker
 bin/ovs-dpctl
 bin/ovs-dpctl-top
 bin/ovs-l3ping
 bin/ovs-ofctl
 bin/ovs-parse-backtrace
 bin/ovs-pcap
 bin/ovs-pki
 bin/ovs-tcpdump
 bin/ovs-tcpundump
 bin/ovs-testcontroller
 bin/ovs-test
 bin/ovs-vlan-test
 bin/ovs-vsctl
 bin/ovsdb-client
 bin/ovsdb-tool
 bin/vtep-ctl
 etc/bash_completion.d/ovs-appctl-bashcomp.bash
 etc/bash_completion.d/ovs-vsctl-bashcomp.bash
 include/openflow/intel-ext.h
 include/openflow/netronome-ext.h
 include/openflow/nicira-ext.h
 include/openflow/openflow-1.0.h
 include/openflow/openflow-1.1.h
 include/openflow/openflow-1.2.h
 include/openflow/openflow-1.3.h
 include/openflow/openflow-1.4.h
 include/openflow/openflow-1.5.h
 include/openflow/openflow-common.h
 include/openflow/openflow.h
 include/openvswitch/compiler.h
 include/openvswitch/dynamic-string.h
 include/openvswitch/flow.h
 include/openvswitch/geneve.h
 include/openvswitch/hmap.h
 include/openvswitch/json.h
 include/openvswitch/list.h
 include/openvswitch/match.h
 include/openvswitch/meta-flow.h
 include/openvswitch/namemap.h
 include/openvswitch/netdev.h
 include/openvswitch/nsh.h
 include/openvswitch/ofp-actions.h
 include/openvswitch/ofp-bundle.h
 include/openvswitch/ofp-connection.h
 include/openvswitch/ofp-ed-props.h
 include/openvswitch/ofp-errors.h
 include/openvswitch/ofp-flow.h
 include/openvswitch/ofp-group.h
 include/openvswitch/ofp-ipfix.h
 include/openvswitch/ofp-match.h
 include/openvswitch/ofp-meter.h
 include/openvswitch/ofp-monitor.h
 include/openvswitch/ofp-msgs.h
 include/openvswitch/ofp-packet.h
 include/openvswitch/ofp-parse.h
 include/openvswitch/ofp-port.h
 include/openvswitch/ofp-print.h
 include/openvswitch/ofp-protocol.h
 include/openvswitch/ofp-prop.h
 include/openvswitch/ofp-queue.h
 include/openvswitch/ofp-switch.h
 include/openvswitch/ofp-table.h
 include/openvswitch/ofp-util.h
 include/openvswitch/ofpbuf.h
 include/openvswitch/packets.h
 include/openvswitch/poll-loop.h
 include/openvswitch/rconn.h
 include/openvswitch/shash.h
 include/openvswitch/thread.h
 include/openvswitch/token-bucket.h
 include/openvswitch/tun-metadata.h
 include/openvswitch/type-props.h
 include/openvswitch/types.h
+include/openvswitch/usdt-probes.h
 include/openvswitch/util.h
 include/openvswitch/uuid.h
 include/openvswitch/vconn.h
 include/openvswitch/version.h
 include/openvswitch/vlog.h
 lib/libofproto-%%SHLIB_VER%%.so.0
-lib/libofproto-%%SHLIB_VER%%.so.0.0.2
+lib/libofproto-%%SHLIB_VER%%.so.0.0.0
 lib/libofproto.so
 lib/libopenvswitch-%%SHLIB_VER%%.so.0
-lib/libopenvswitch-%%SHLIB_VER%%.so.0.0.2
+lib/libopenvswitch-%%SHLIB_VER%%.so.0.0.0
 lib/libopenvswitch.so
 lib/libovsdb-%%SHLIB_VER%%.so.0
-lib/libovsdb-%%SHLIB_VER%%.so.0.0.2
+lib/libovsdb-%%SHLIB_VER%%.so.0.0.0
 lib/libovsdb.so
 lib/libsflow-%%SHLIB_VER%%.so.0
-lib/libsflow-%%SHLIB_VER%%.so.0.0.2
+lib/libsflow-%%SHLIB_VER%%.so.0.0.0
 lib/libsflow.so
 lib/libvtep-%%SHLIB_VER%%.so.0
-lib/libvtep-%%SHLIB_VER%%.so.0.0.2
+lib/libvtep-%%SHLIB_VER%%.so.0.0.0
 lib/libvtep.so
 libdata/pkgconfig/libofproto.pc
 libdata/pkgconfig/libopenvswitch.pc
 libdata/pkgconfig/libovsdb.pc
 libdata/pkgconfig/libsflow.pc
 man/man1/ovs-pcap.1.gz
 man/man1/ovsdb-client.1.gz
 man/man1/ovsdb-server.1.gz
 man/man1/ovsdb-tool.1.gz
 man/man5/ovs-vswitchd.conf.db.5.gz
 man/man5/ovsdb-server.5.gz
 man/man5/vtep.5.gz
-man/man7/ovs-actions.7.gz
 man/man7/ovs-fields.7.gz
 man/man8/ovs-bugtool.8.gz
 man/man8/ovs-dpctl-top.8.gz
 man/man8/ovs-dpctl.8.gz
 man/man8/ovs-kmod-ctl.8.gz
 man/man8/ovs-ofctl.8.gz
 man/man8/ovs-testcontroller.8.gz
 man/man8/ovs-vsctl.8.gz
 man/man8/ovs-vswitchd.8.gz
 man/man8/vtep-ctl.8.gz
 sbin/ovs-bugtool
 sbin/ovs-vswitchd
 sbin/ovsdb-server
 %%DATADIR%%/bugtool-plugins/kernel-info/openvswitch.xml
 %%DATADIR%%/bugtool-plugins/network-status/openvswitch.xml
 %%DATADIR%%/bugtool-plugins/system-configuration.xml
 %%DATADIR%%/bugtool-plugins/system-configuration/openvswitch.xml
 %%DATADIR%%/bugtool-plugins/system-logs/openvswitch.xml
 %%DATADIR%%/python/ovs/__init__.py
 %%DATADIR%%/python/ovs/compat/__init__.py
 %%DATADIR%%/python/ovs/compat/sortedcontainers/__init__.py
 %%DATADIR%%/python/ovs/compat/sortedcontainers/sorteddict.py
 %%DATADIR%%/python/ovs/compat/sortedcontainers/sortedlist.py
 %%DATADIR%%/python/ovs/compat/sortedcontainers/sortedset.py
 %%DATADIR%%/python/ovs/daemon.py
 %%DATADIR%%/python/ovs/db/__init__.py
 %%DATADIR%%/python/ovs/db/custom_index.py
 %%DATADIR%%/python/ovs/db/data.py
 %%DATADIR%%/python/ovs/db/error.py
 %%DATADIR%%/python/ovs/db/idl.py
 %%DATADIR%%/python/ovs/db/parser.py
 %%DATADIR%%/python/ovs/db/schema.py
 %%DATADIR%%/python/ovs/db/types.py
 %%DATADIR%%/python/ovs/dirs.py
 %%DATADIR%%/python/ovs/fatal_signal.py
 %%DATADIR%%/python/ovs/fcntl_win.py
 %%DATADIR%%/python/ovs/json.py
 %%DATADIR%%/python/ovs/jsonrpc.py
 %%DATADIR%%/python/ovs/ovsuuid.py
 %%DATADIR%%/python/ovs/poller.py
 %%DATADIR%%/python/ovs/process.py
 %%DATADIR%%/python/ovs/reconnect.py
 %%DATADIR%%/python/ovs/socket_util.py
 %%DATADIR%%/python/ovs/stream.py
 %%DATADIR%%/python/ovs/timeval.py
 %%DATADIR%%/python/ovs/unixctl/__init__.py
 %%DATADIR%%/python/ovs/unixctl/client.py
 %%DATADIR%%/python/ovs/unixctl/server.py
 %%DATADIR%%/python/ovs/util.py
 %%DATADIR%%/python/ovs/version.py
 %%DATADIR%%/python/ovs/vlog.py
 %%DATADIR%%/python/ovs/winutils.py
 %%DATADIR%%/python/ovstest/__init__.py
 %%DATADIR%%/python/ovstest/args.py
 %%DATADIR%%/python/ovstest/rpcserver.py
 %%DATADIR%%/python/ovstest/tcp.py
 %%DATADIR%%/python/ovstest/tests.py
 %%DATADIR%%/python/ovstest/udp.py
 %%DATADIR%%/python/ovstest/util.py
 %%DATADIR%%/python/ovstest/vswitch.py
 %%DATADIR%%/scripts/ovs-bugtool-daemons-ver
 %%DATADIR%%/scripts/ovs-bugtool-fdb-show
 %%DATADIR%%/scripts/ovs-bugtool-get-dpdk-nic-numa
 %%DATADIR%%/scripts/ovs-bugtool-get-port-stats
 %%DATADIR%%/scripts/ovs-bugtool-qos-configs
 %%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif
 %%DATADIR%%/scripts/ovs-bugtool-ovs-bridge-datapath-type
 %%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges
 %%DATADIR%%/scripts/ovs-bugtool-ovs-vswitchd-threads-affinity
 %%DATADIR%%/scripts/ovs-bugtool-tc-class-show
 %%DATADIR%%/scripts/ovs-check-dead-ifs
 %%DATADIR%%/scripts/ovs-ctl
 %%DATADIR%%/scripts/ovs-kmod-ctl
 %%DATADIR%%/scripts/ovs-lib
 %%DATADIR%%/scripts/ovs-monitor-ipsec
 %%DATADIR%%/scripts/ovs-save
 %%DATADIR%%/scripts/ovs-vtep
 %%DATADIR%%/vswitch.ovsschema
 %%DATADIR%%/vtep.ovsschema
 @dir /var/lib/openvswitch/pki
 @dir /var/lib/openvswitch
 @dir /var/lib
 @dir /var/log/openvswitch
 @dir /var/run/openvswitch
 @dir %%ETCDIR%%