diff --git a/.gitignore b/.gitignore
index 6cfba05..de66c99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ x86_64
 Makefile
 /nfs-utils-2.2.1.tar.xz
 nfs-utils-2.2.1/
+/nfs-utils-2.3.1.tar.xz
+nfs-utils-2.3.1/
diff --git a/nfs-utils.spec b/nfs-utils.spec
index cb3a3d6..b8c31ed 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,8 +1,8 @@
 Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
 Name: nfs-utils
 URL: http://linux-nfs.org/
-Version: 2.2.1
-Release: 4.rc2%{?dist}
+Version: 2.3.1
+Release: 0%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -15,8 +15,6 @@ Source3: nfs-utils_env.sh
 Source4: lockd.conf
 Source5: 24-nfs-server.conf
 
-Patch001: nfs-utils-2.2.2-rc2.patch
-
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
 Patch102: nfs-utils-1.2.5-idmap-errmsg.patch
@@ -315,10 +313,12 @@ fi
 %files -n libnfsidmap-devel
 %{_libdir}/pkgconfig/libnfsidmap.pc
 %{_includedir}/nfsidmap.h
+%{_includedir}/nfsidmap_plugin.h
 %{_libdir}/libnfsidmap.so
 
 %changelog
-* Wed Dec 20 2017 Steve Dickson <steved@redhat.com> 2.2.1-4.rc2
+* Wed Dec 20 2017 Steve Dickson <steved@redhat.com> 2.3.1-0
+- Updated to latest upstream release: 2.3.1
 - Removed unnecessary chown rpcuser in %post
 
 * Tue Dec 19 2017 Steve Dickson <steved@redhat.com> 2.2.1-3.rc2
diff --git a/sources b/sources
index e42db5a..270012c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (nfs-utils-2.2.1.tar.xz) = 50898a5d71ad9369d177dd1f004d3ddc150b201b1af65f6c91dbe2505fad3ebecc7033eb14dc2f3b71704bdece645f6f2d62107c8b421c5fa98831898e36c30f
+SHA512 (nfs-utils-2.3.1.tar.xz) = 812f48690b109a0456685a9a04997da9281f58d70d2aa34b614f64de6f1fc086db3d3cc4d16c2f5fe98026b39dadd03ba71780ad8ac37f94cd1375a50023369a