diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 83e4953f5b..e68e7413d9 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -127,23 +127,13 @@ define KernelPackage/openvswitch
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Support
-  TITLE:=Open vSwitch Kernel Package
-  KCONFIG:= \
-	CONFIG_BRIDGE \
-	CONFIG_OPENVSWITCH \
-	CONFIG_OPENVSWITCH_GRE=n \
-	CONFIG_OPENVSWITCH_VXLAN=n \
-	CONFIG_OPENVSWITCH_GENEVE=n
+  TITLE:=Open vSwitch kernel datapath
+  KCONFIG:=CONFIG_OPENVSWITCH
   DEPENDS:= \
-	@IPV6 +kmod-gre +kmod-lib-crc32c +kmod-mpls \
-	+kmod-vxlan +kmod-nf-nat +kmod-nf-nat6
+	+kmod-lib-crc32c +kmod-mpls \
+	+kmod-nf-nat +IPV6:kmod-nf-nat6
   FILES:= $(LINUX_DIR)/net/openvswitch/openvswitch.ko
-  AUTOLOAD:=$(call AutoLoad,21,openvswitch)
-endef
-
-define KernelPackage/openvswitch/description
-  This package contains the Open vSwitch kernel moodule and bridge compat
-  module. Furthermore, it supports OpenFlow.
+  AUTOLOAD:=$(call AutoProbe,openvswitch)
 endef
 
 CONFIGURE_ARGS += --enable-ndebug