diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 8870711..c16feb9 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -79,9 +79,9 @@
 %global dev_version %{lua: extraver = string.gsub('', '%-', '.'); print(extraver) }
 
 Name:		nfs-ganesha
-Version:	2.3.0
+Version:	2.3.1
 Release:	1%{?dev_version:%{dev_version}}%{?dist}
-Summary:	NFS-Ganesha is a NFS Server running in user space
+Summary:	NFS Server running in user space
 Group:		Applications/System
 License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
@@ -102,6 +102,11 @@ BuildRequires:	libntirpc-devel >= 1.3.1
 %endif
 Requires:	dbus
 Requires:	nfs-utils
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
+Requires:	rpcbind
+%else
+Requires:	portmap
+%endif
 %if %{with_nfsidmap}
 BuildRequires:	libnfsidmap-devel
 %else
@@ -567,6 +572,9 @@ install -m 644 ChangeLog	%{buildroot}%{_defaultdocdir}/ganesha
 %endif
 
 %changelog
+* Wed Mar 16 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.1-1
+- 2.3.1 GA
+
 * Wed Oct 28 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-1
 - 2.3.0 GA
 
diff --git a/sources b/sources
index 336ad82..5271097 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 feb466ad1ea3e34a54819768e6d22450  nfs-ganesha-2.3.0.tar.gz
+=======
+b4fc41095ee567c6d638bdc9cdfe9697  nfs-ganesha-2.3.1.tar.gz
+>>>>>>> origin/f23