diff --git a/nfs-utils/.footprint b/nfs-utils/.footprint
index 634136211..7a278280a 100644
--- a/nfs-utils/.footprint
+++ b/nfs-utils/.footprint
@@ -2,6 +2,7 @@ drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/exports
 drwxr-xr-x	root/root	etc/exports.d/
 -rw-r--r--	root/root	etc/idmapd.conf
+-rw-r--r--	root/root	etc/nfs.conf
 -rw-r--r--	root/root	etc/nfsmount.conf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/nfs
@@ -39,8 +40,10 @@ drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/exports.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/nfs.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/nfs.conf.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/nfsmount.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man7/
+-rw-r--r--	root/root	usr/share/man/man7/nfs.systemd.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/nfsd.7.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/blkmapd.8.gz
@@ -75,4 +78,3 @@ drwx------	nobody/root	var/lib/nfs/sm.bak/
 drwx------	nobody/root	var/lib/nfs/sm/
 -rw-------	nobody/root	var/lib/nfs/state (EMPTY)
 drwxr-xr-x	root/root	var/lib/nfs/v4recovery/
--rw-r--r--	root/root	var/lib/nfs/xtab (EMPTY)
diff --git a/nfs-utils/.md5sum b/nfs-utils/.md5sum
index 787a34d1d..cedb05a84 100644
--- a/nfs-utils/.md5sum
+++ b/nfs-utils/.md5sum
@@ -1,7 +1,7 @@
 c5ccf58f5f9f57aba75c8b72219eb6e6  exports
 167ea3a16eb6f33b3642e920147bb265  idmapd.conf
 49054b601b8277e86cafae36911cba46  nfs
-2fabdadb8ff415a1eafcfb12ab1bf781  nfs-utils-1.3.4.tar.bz2
+1157abcfaa8670f990f408cf280426b4  nfs-utils-2.1.1.tar.bz2
 6981419f23fbe0a0ef3b44eb2efac8fd  nfsclient
 eb907aa29567365aef517b7948dc9aa0  nfsserver
 dfe1c59368b5846316ebcf3b32666c54  rpc.idmapd
diff --git a/nfs-utils/Pkgfile b/nfs-utils/Pkgfile
index d40b448da..1f6e40000 100644
--- a/nfs-utils/Pkgfile
+++ b/nfs-utils/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  util-linux eudev libcap rpcbind libnfsidmap libevent keyutils sqlite3
 
 name=nfs-utils
-version=1.3.4
+version=2.1.1
 release=1
 source=(http://downloads.sourceforge.net/project/nfs/$name/$version/$name-$version.tar.bz2
         exports idmapd.conf
@@ -29,7 +29,7 @@ build () {
     install -m 644 $SRC/{exports,idmapd.conf} $PKG/etc/
 
     install -m 644 utils/mount/nfsmount.conf $PKG/etc/
-    sed -i '/Defaultvers=/s/^# *//' $PKG/etc/nfsmount.conf
+    install -m 644 nfs.conf $PKG/etc/
 
     install -d $PKG/var/lib/nfs/{rpc_pipefs,v4recovery,nfsdcltrack}
     install -d $PKG/etc/exports.d
diff --git a/nfs-utils/nfssvc_setfds.patch b/nfs-utils/nfssvc_setfds.patch
deleted file mode 100644
index e9604f19b..000000000
--- a/nfs-utils/nfssvc_setfds.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-On Mon, Aug 17, 2015 at 08:40:25AM -0700, Chuck Lever wrote:
-> Probably stopped working with "rpc.nfsd: Squelch DNS errors when
-> using --host option".
-> 
-> getaddrinfo(3) returns a list of addresses, some of which are
-> IPv6 addresses. It gets the list from /etc/hosts, or DNS. Even
-> on kernels which do not support IPv6, there may be at least one
-> IPv6 address in the list.
-> 
-> nfssvc_setfds() then loops over this list. The error handling
-> in nfssvc_setfds() causes the loop to exit if the socket(2)
-> call fails. It should "continue" if the error is EAFNOSUPPORT.
-> In fact, that xlog notice can also be removed.
-> 
-> I'm traveling this week. Is this enough for you to generate a
-> fix?
-
-Yes, that works:
-
----
-From: Christoph Hellwig <hch@lst.de>
-Subject: nfsd: ignore unsupported address types in nfssvc_setfds
-
-Just continue and try a different record returned from getaddrinfo
-if the kernel does not support an address family.  This fixes nfsd
-startup on kernels without IPv6 support.
-
-Suggested-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-
-diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
-index a2b11d8..fc11d23 100644
---- a/utils/nfsd/nfssvc.c
-+++ b/utils/nfsd/nfssvc.c
-@@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
- 		sockfd = socket(addr->ai_family, addr->ai_socktype,
- 				addr->ai_protocol);
- 		if (sockfd < 0) {
--			if (errno == EAFNOSUPPORT)
--				xlog(L_NOTICE, "address family %s not "
--						"supported by protocol %s",
--						family, proto);
--			else
-+			if (errno != EAFNOSUPPORT) {
- 				xlog(L_ERROR, "unable to create %s %s socket: "
- 				     "errno %d (%m)", family, proto, errno);
--			rc = errno;
--			goto error;
-+				rc = errno;
-+				goto error;
-+			}
-+			addr = addr->ai_next;
-+			continue;
- 		}
- #ifdef IPV6_SUPPORTED
- 		if (addr->ai_family == AF_INET6 &&
---