diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 650150bef7540..683be35164782 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,2 +1,3 @@
 DIST openvswitch-3.3.8.tar.gz 9317938 BLAKE2B 59a40b0c1c9f89c79d2936c79f614bbfae5143b7b8c199f3368ed747a2a5e6f33f31ff27193a0f96b701e09eb11a29138a99577a45c4eeacebb74be5cd4b348f SHA512 3ac2632b36bdee5888783c7f30185dbcfa33ca41ce98eed05d1a73f295927940acc900d166c0a8f6deac648c34dfa2a894e0678f636ba0d849737e52afb6008c
 DIST openvswitch-3.3.9.tar.gz 9322110 BLAKE2B bcc00b374ec530e4a07e6f15f302ffc59f3c4402bf09015c68cec1cb1aabdacad6931c7cf7daea89db01932055cce888973af363cd9041c54f9991d38c661d49 SHA512 99457faa2ea6a5a8b8f4ded4f66b4e6d8e891672a2873d4ac2837aacb527c0f6dae78ac88ff55011d6bd738554de1632065548e473cd2eb7d385e9f533fdb654
+DIST openvswitch-3.7.1.tar.gz 10468248 BLAKE2B 0020f09f651d79bab65eadd75557d22c66f297a703bdcd591d882c27df68fe5d9f84947d6ab641ff4fb1be518e51c3706f10d99e31284ae2f48223bd1fb5a0e4 SHA512 a225739aba78d629b8ef25e806a0db331c59c50318cceef30052b7c7f51b978e2aef9f7fa06aa6b63c46a5c6165ba3d23d2da46014f316110df952f83745fe8b
diff --git a/net-misc/openvswitch/openvswitch-3.7.1.ebuild b/net-misc/openvswitch/openvswitch-3.7.1.ebuild
new file mode 100644
index 0000000000000..ba55ea0d3a081
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-3.7.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{12..14} )
+inherit autotools dot-a linux-info multiprocessing python-single-r1
+inherit systemd tmpfiles
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug monitor selinux +ssl unwind valgrind xdp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Check python/ovs/version.py in tarball for dev-python/ovs dep
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		~dev-python/ovs-3.7.1[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+	')
+	sys-apps/lsb-release
+	debug? ( dev-lang/perl )
+	unwind? ( sys-libs/libunwind:= )
+	selinux? ( sec-policy/selinux-openvswitch )
+	ssl? ( dev-libs/openssl:= )
+	xdp? (
+		dev-libs/libbpf:=
+		net-libs/xdp-tools
+		sys-process/numactl
+	)
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/util-linux[caps]
+	virtual/os-headers
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN ~OPENVSWITCH"
+
+pkg_setup() {
+	if use xdp ; then
+		CONFIG_CHECK+=" ~BPF ~BPF_JIT ~BPF_SYSCALL ~HAVE_BPF_JIT ~XDP_SOCKETS"
+	fi
+
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	lto-guarantee-fat
+
+	# monitor is statically enabled for bug #596206
+	# use monitor || export ovs_cv_python="no"
+
+	# flake8 is primarily a style guide tool, running it as part of the tests
+	# in Gentoo does not make much sense, only breaks them: bug #607280
+	export ovs_cv_flake8="no"
+
+	# Only adds a diagram to the man page, just skip it as we don't
+	# want to add a BDEPEND on graphviz right now. bug #856286
+	export ovs_cv_dot="no"
+
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	export ac_cv_lib_unwind_unw_backtrace=$(usex unwind)
+
+	local myeconfargs=(
+		--with-rundir=/run/openvswitch
+		--with-logdir=/var/log/openvswitch
+		--with-pkidir=/etc/ssl/openvswitch
+		--with-dbdir=/var/lib/openvswitch
+		$(use_enable ssl)
+		$(use_enable !debug ndebug)
+		$(use_enable xdp afxdp)
+	)
+
+	# Need PYTHON3 variable for bug #860240
+	export PYTHON3="${PYTHON}"
+	export CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# https://docs.openvswitch.org/en/latest/topics/testing/
+	# RECHECK=yes because with parallel tests, sometimes a port is
+	# in use.
+	emake -Onone check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" RECHECK=yes
+}
+
+src_install() {
+	default
+
+	strip-lto-bytecode
+
+	local SCRIPT
+	if use monitor; then
+		# ovs-bugtool is installed to sbin by the build system, but we
+		# install it to bin below, and these clash in merged-usr
+		# https://bugs.gentoo.org/889846
+		rm "${ED}"/usr/sbin/ovs-bugtool || die
+
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	# Used for system-id.conf
+	keepdir /etc/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+	newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+}
+
+pkg_postinst() {
+	tmpfiles_process openvswitch.conf
+
+	# Only needed on non-systemd, but helps anyway
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in ${EPREFIX}/var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}