diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index bcb66360bc..d16e722cae 100644
--- a/net/nfs-kernel-server/Makefile
+++ b/net/nfs-kernel-server/Makefile
@@ -7,9 +7,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-kernel-server
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.2.1
 PKG_RELEASE:=1
-PKG_HASH:=0a28416948516c26f3bfe90425b0de09b79364dc1f508bf1dda8de66e1edbb09
+PKG_HASH:=0d819d8da358bea6e005e1a6cf0f6fa0c5507a78747d36bc87a0182e6af14291
 
 PKG_SOURCE_URL:=@SF/nfs
 PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2
@@ -86,6 +86,7 @@ CONFIGURE_ARGS += \
 
 CONFIGURE_VARS += \
 	libblkid_cv_is_recent=yes \
+	ac_cv_lib_resolv___res_querydomain=yes \
 	CONFIG_SQLITE3_TRUE="\#" \
 	CONFIG_NFSDCLD_TRUE="\#"
 
diff --git a/net/nfs-kernel-server/patches/101-musl-getservbyport.patch b/net/nfs-kernel-server/patches/101-musl-getservbyport.patch
index efe565c5b4..8e926e1eb1 100644
--- a/net/nfs-kernel-server/patches/101-musl-getservbyport.patch
+++ b/net/nfs-kernel-server/patches/101-musl-getservbyport.patch
@@ -1,11 +1,9 @@
 Musl will always return something with getservbyport so we cannot skip
 ports that returns non-null.
 
-diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
-index fd576d9..d72a0bf 100644
 --- a/utils/statd/rmtcall.c
 +++ b/utils/statd/rmtcall.c
-@@ -90,8 +90,10 @@ statd_get_socket(void)
+@@ -93,8 +93,10 @@ statd_get_socket(void)
  					__func__);
  			break;
  		}
@@ -14,5 +12,5 @@ index fd576d9..d72a0bf 100644
  		if (se == NULL)
 +#endif
  			break;
- 		/* rather not use that port, try again */
  
+ 		if (retries == MAX_BRP_RETRIES) {
diff --git a/net/nfs-kernel-server/patches/102-limits.patch b/net/nfs-kernel-server/patches/102-limits.patch
new file mode 100644
index 0000000000..67701c3602
--- /dev/null
+++ b/net/nfs-kernel-server/patches/102-limits.patch
@@ -0,0 +1,10 @@
+--- a/support/misc/file.c
++++ b/support/misc/file.c
+@@ -27,6 +27,7 @@
+ #include <dirent.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
++#include <limits.h>
+ 
+ #include "xlog.h"
+ #include "misc.h"