diff --git a/utils/lxc/Config.in b/utils/lxc/Config.in
index 53d7ba5fd733cd..37aa3034be2bc7 100644
--- a/utils/lxc/Config.in
+++ b/utils/lxc/Config.in
@@ -4,10 +4,12 @@ menu "Configuration"
 config LXC_KERNEL_OPTIONS
 	bool "Enable kernel support for LXC"
 	default n
+	select KERNEL_CHECKPOINT_RESTORE
 	select KERNEL_CGROUPS
 	select KERNEL_NAMESPACES
 	select KERNEL_DEVPTS_MULTIPLE_INSTANCES
 	select KERNEL_POSIX_MQUEUE
+	select KERNEL_CGROUP_DEVICE
 	select KERNEL_CGROUP_SCHED
 	select KERNEL_FAIR_GROUP_SCHED
 	select KERNEL_RT_GROUP_SCHED
@@ -16,6 +18,7 @@ config LXC_KERNEL_OPTIONS
 	select KERNEL_MEMCG_KMEM
 	select KERNEL_CPUSETS
 	select PACKAGE_kmod-ikconfig
+	select PACKAGE_kmod-unix-diag
 	help
 	  Select needed kernel options for LXC related utilities. Options
 	  include cgroups, namespaces and other miscellaneous options. These
@@ -50,6 +53,10 @@ config LXC_NETWORKING
 	default n
 	select PACKAGE_kmod-veth
 	select PACKAGE_kmod-macvlan
+	select PACKAGE_kmod-inet-diag
+	select PACKAGE_kmod-ipt-checksum
+	select PACKAGE_kmod-netlink-diag
+	select PACKAGE_kmod-packet-diag
 	help
 	  Enable "veth pair device" and "macvlan"
 
diff --git a/utils/lxc/patches/019-lxc-checkconfig-remove-options-for-lxc-net.patch b/utils/lxc/patches/019-lxc-checkconfig-remove-options-for-lxc-net.patch
new file mode 100644
index 00000000000000..4423b4e451b84c
--- /dev/null
+++ b/utils/lxc/patches/019-lxc-checkconfig-remove-options-for-lxc-net.patch
@@ -0,0 +1,19 @@
+--- a/src/lxc/cmd/lxc-checkconfig.in
++++ b/src/lxc/cmd/lxc-checkconfig.in
+@@ -250,16 +250,10 @@ if { [ "${KVER_MAJOR}" -gt 3 ] && [ "${K
+     printf "CONFIG_NF_NAT_IPV6: " && is_enabled CONFIG_NF_NAT_IPV6 && is_probed nf_nat_ipv6
+ fi
+ echo
+-printf "CONFIG_IP_NF_TARGET_MASQUERADE: " && is_enabled CONFIG_IP_NF_TARGET_MASQUERADE && is_probed nf_nat_masquerade_ipv4
+-echo
+-printf "CONFIG_IP6_NF_TARGET_MASQUERADE: " && is_enabled CONFIG_IP6_NF_TARGET_MASQUERADE && is_probed nf_nat_masquerade_ipv6
+-echo
+ printf "CONFIG_NETFILTER_XT_TARGET_CHECKSUM: " && is_enabled CONFIG_NETFILTER_XT_TARGET_CHECKSUM && is_probed xt_CHECKSUM
+ echo
+ printf "CONFIG_NETFILTER_XT_MATCH_COMMENT: " && is_enabled CONFIG_NETFILTER_XT_MATCH_COMMENT && is_probed xt_comment
+ echo
+-printf "FUSE (for use with lxcfs): " && is_enabled CONFIG_FUSE_FS && is_probed fuse
+-echo
+ 
+ echo "
+ --- Checkpoint/Restore ---"