diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index d293ed47073b..8bd72c253942 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	openvswitch
 DISTVERSION=	2.17.12
 CATEGORIES=	net
 MASTER_SITES=	http://openvswitch.org/releases/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Production quality, multilayer virtual switch
 WWW=		http://openvswitch.org/
 
 LICENSE=	APACHE20
 
 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
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+CONFIGURE_ENV=	PYTHON3=${PYTHON_CMD}
 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/files/patch-configure b/net/openvswitch/files/patch-configure
deleted file mode 100644
index 8b999fe85ad5..000000000000
--- a/net/openvswitch/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2021-02-15 18:24:25 UTC
-+++ configure
-@@ -18326,7 +18326,7 @@ else
-         ovs_cv_python3=$PYTHON3
-       else
-         ovs_cv_python3=no
--        for binary in python3 python3.4 python3.5 python3.6 python3.7; do
-+        for binary in python3 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 python3.10 python3.11; do
-           ovs_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-           for dir in $PATH; do
-             IFS=$ovs_save_IFS