diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 9e3978f..9e3bba2 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -73,8 +73,6 @@
 #%%global dev_version %{lua: extraver = string.gsub('-rc-final', '%-', ''); print(extraver) }
 
 %global		versiontag	2.2.0
-%global		ntirpcname	ntirpc
-%global		ntirpcvers	1.2.1
 
 Name:		nfs-ganesha
 Version:	2.2.0
@@ -85,7 +83,7 @@ License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
 Source0:	https://github.com/%{name}/%{name}/archive/V%{versiontag}/%{name}-%{version}.tar.gz
-Source1:	https://github.com/%{name}/%{ntirpcname}/archive/v%{ntirpcvers}/%{ntirpcname}-%{ntirpcvers}.tar.gz
+Patch0:		nfs-ganesha-2.2.0-CMakeLists.txt.patch
 
 BuildRequires:	cmake
 BuildRequires:	bison flex
@@ -304,7 +302,7 @@ be used with NFS-Ganesha to support PT
 Summary: The NFS-GANESHA's GLUSTER FSAL
 Group: Applications/System
 Requires: nfs-ganesha = %{version}-%{release}
-BuildRequires:	glusterfs-api-devel >= 3.7.2
+BuildRequires:	glusterfs-api-devel >= 3.5.1
 BuildRequires:	libattr-devel
 
 %description gluster
@@ -313,9 +311,9 @@ be used with NFS-Ganesha to support Gluster
 %endif
 
 %prep
-%setup -q -n %{name}-%{versiontag} -a 1
+%setup -q -n %{name}-%{versiontag}
 rm -rf contrib/libzfswrapper
-mv %{ntirpcname}-%{ntirpcvers}/* src/libntirpc/
+%patch0 -p1
 
 %build
 %cmake ./src -DCMAKE_BUILD_TYPE=Debug			\
@@ -567,20 +565,19 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 
 %changelog
 * Fri Jul 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-5
-- Requires: libntirpc-devel on base
+- BuildRequires: libntirprc on base
 
 * Fri Jul 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-4
 - link with unbundled, shared libntirpc again
 
-* Wed Jun 17 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-3
-- build issue with unbundled libntirpc doesn't work, reverting to
-  bundled libntirpc until the build issue is resolved
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
 * Wed May 27 2015 Niels de Vos <ndevos@redhat.com>
 - improve readability and allow "rpmbuild --with .." options again
 
 * Fri May 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-2
-- %%license, build with glusterfs-3.7.0 GA
+- %license, build with glusterfs-3.7.0 GA
 
 * Tue Apr 21 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-1
 - 2.2.0 GA