diff --git a/package/libs/nghttp2/Makefile b/package/libs/nghttp2/Makefile
index 1d364c7023..99555a57db 100644
--- a/package/libs/nghttp2/Makefile
+++ b/package/libs/nghttp2/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nghttp2
-PKG_VERSION:=1.39.2
-PKG_RELEASE:=2
+PKG_VERSION:=1.40.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION)
-PKG_HASH:=a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b
+PKG_HASH:=09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
diff --git a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
index d745a97026..88e5386c1f 100644
--- a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
+++ b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
  # netlink interface for nf_conntrack
 --- /dev/null
 +++ b/net/netfilter/nf_conntrack_rtcache.c
-@@ -0,0 +1,440 @@
+@@ -0,0 +1,428 @@
 +/* route cache for netfilter.
 + *
 + * (C) 2014 Red Hat GmbH
@@ -475,18 +475,8 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
 +		return ret;
 +	}
 +
-+	ret = nf_register_net_hooks(&init_net, rtcache_ops,
-+				    ARRAY_SIZE(rtcache_ops));
-+	if (ret < 0) {
-+		nf_ct_extend_unregister(&rtcache_extend);
-+		unregister_pernet_subsys(&rtcache_ops_net_ops);
-+		return ret;
-+	}
-+
 +	ret = register_netdevice_notifier(&nf_rtcache_notifier);
 +	if (ret) {
-+		nf_unregister_net_hooks(&init_net, rtcache_ops,
-+					ARRAY_SIZE(rtcache_ops));
 +		nf_ct_extend_unregister(&rtcache_extend);
 +		unregister_pernet_subsys(&rtcache_ops_net_ops);
 +	}
@@ -538,8 +528,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
 +
 +	unregister_netdevice_notifier(&nf_rtcache_notifier);
 +	unregister_pernet_subsys(&rtcache_ops_net_ops);
-+	for_each_net(net)
-+		nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
 +
 +	synchronize_net();
 +
diff --git a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch
index 2d84bc2acf..c02b8f39e0 100644
--- a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch
+++ b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch
@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
  # netlink interface for nf_conntrack
 --- /dev/null
 +++ b/net/netfilter/nf_conntrack_rtcache.c
-@@ -0,0 +1,440 @@
+@@ -0,0 +1,428 @@
 +/* route cache for netfilter.
 + *
 + * (C) 2014 Red Hat GmbH
@@ -475,18 +475,8 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
 +		return ret;
 +	}
 +
-+	ret = nf_register_net_hooks(&init_net, rtcache_ops,
-+				    ARRAY_SIZE(rtcache_ops));
-+	if (ret < 0) {
-+		nf_ct_extend_unregister(&rtcache_extend);
-+		unregister_pernet_subsys(&rtcache_ops_net_ops);
-+		return ret;
-+	}
-+
 +	ret = register_netdevice_notifier(&nf_rtcache_notifier);
 +	if (ret) {
-+		nf_unregister_net_hooks(&init_net, rtcache_ops,
-+					ARRAY_SIZE(rtcache_ops));
 +		nf_ct_extend_unregister(&rtcache_extend);
 +		unregister_pernet_subsys(&rtcache_ops_net_ops);
 +	}
@@ -538,8 +528,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
 +
 +	unregister_netdevice_notifier(&nf_rtcache_notifier);
 +	unregister_pernet_subsys(&rtcache_ops_net_ops);
-+	for_each_net(net)
-+		nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
 +
 +	synchronize_net();
 +