diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index a112c9a918..95d7aacb97 100644
--- a/net/nfs-kernel-server/Makefile
+++ b/net/nfs-kernel-server/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-kernel-server
 PKG_VERSION:=2.8.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_HASH:=11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725
 
 PKG_SOURCE_URL:=@KERNEL/linux/utils/nfs-utils/$(PKG_VERSION)
@@ -27,6 +27,7 @@ PKG_CONFIG_DEPENDS:= \
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/nfs-kernel-server/Default
 	SECTION:=net
diff --git a/net/nfs-kernel-server/patches/220-fix-ld-error.patch b/net/nfs-kernel-server/patches/220-fix-ld-error.patch
new file mode 100644
index 0000000000..bca716ccc6
--- /dev/null
+++ b/net/nfs-kernel-server/patches/220-fix-ld-error.patch
@@ -0,0 +1,32 @@
+--- a/tools/rpcgen/rpc_tblout.c
++++ b/tools/rpcgen/rpc_tblout.c
+@@ -82,14 +82,19 @@ write_table (const definition * def)
+   proc_list *proc;
+   int current;
+   int expected;
+-  char progvers[100];
++  char *progvers;
+   int warning;
++  int a;
+ 
+   for (vp = def->def.pr.versions; vp != NULL; vp = vp->next)
+     {
+       warning = 0;
+-      s_print (progvers, "%s_%s",
++     a = asprintf (&progvers, "%s_%s", 
+ 	       locase (def->def_name), vp->vers_num);
++     if (a == -1)
++     {
++	     return;
++     }
+       /* print the table header */
+       f_print (fout, tbl_hdr, progvers);
+ 
+@@ -146,6 +151,7 @@ write_table (const definition * def)
+       /* print the table trailer */
+       f_print (fout, tbl_end);
+       f_print (fout, tbl_nproc, progvers, progvers, progvers);
++      free (progvers);
+     }
+ }
+