diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index badd54231b0e34bb23285d7059e9e5be1952f3a0..a3abf0da08617ea95b3476d22dd3892bf130664a 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -144,13 +144,24 @@ endef
 
 $(eval $(call KernelPackage,8021q))
 
+define KernelPackage/udptunnel6
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=UDP tunneling support
+  DEPENDS:=@!(LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14) +kmod-ipv6
+  KCONFIG:=CONFIG_NET_UDP_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko
+  AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel)
+endef
+
+$(eval $(call KernelPackage,udptunnel6))
+
 define KernelPackage/vxlan
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Native VXLAN Kernel support
-  DEPENDS:=+kmod-iptunnel
+  DEPENDS:=+kmod-iptunnel +IPV6:kmod-udptunnel6
   KCONFIG:=CONFIG_VXLAN
   FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
-  AUTOLOAD:=$(call AutoLoad,13,vxlan)
+  AUTOLOAD:=$(call AutoLoad,33,vxlan)
 endef
 
 define KernelPackage/vxlan/description
diff --git a/target/linux/x86_64/config-default b/target/linux/x86_64/config-default
index dde8b25499f21dd2d6802ba31a6c5b8ad769b098..dbbb3e84e8e9e0eb8c8728e83c1e57172def497c 100644
--- a/target/linux/x86_64/config-default
+++ b/target/linux/x86_64/config-default
@@ -345,6 +345,8 @@ CONFIG_PARAVIRT_CLOCK=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_IOAPIC is not set