diff --git a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild
similarity index 94%
rename from net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild
rename to net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild
index 93a0483b3aeb6..56cef678d10bc 100644
--- a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	)
 	ssl? ( dev-libs/openssl:0= )
 	${PYTHON_DEPS}
+	~dev-python/ovs-${PV}
 	dev-python/twisted-core
 	dev-python/twisted-conch
 	dev-python/twisted-web
@@ -94,15 +95,9 @@ src_install() {
 		python_foreach_impl python_doscript utilities/"${SCRIPT}"
 	done
 
-	# monitor is statically enabled for bug 596206
-	#if use monitor ; then
-	python_install() {
-		python_domodule "${ED%/}"/usr/share/openvswitch/python/*
-		python_optimize "${ED%/}"/usr/share/ovsdbmonitor
-	}
-	python_foreach_impl python_install
+	python_foreach_impl python_optimize "${ED%/}"/usr/share/ovsdbmonitor
+
 	rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	#fi
 
 	keepdir /var/{lib,log}/openvswitch
 	keepdir /etc/ssl/openvswitch