diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 76a3a24..1de7730 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -73,9 +73,12 @@
 %bcond_without gui_utils
 %global use_gui_utils %{on_off_switch gui_utils}
 
-%global dev_version %{lua: extraver = string.gsub('-rc4', '%-', ''); print(extraver) }
+%bcond_with ntirpc
+%global use_ntirpc %{on_off_switch ntirpc}
 
-%global		versiontag	2.3-rc4
+%global dev_version %{lua: extraver = string.gsub('-rc5', '%-', ''); print(extraver) }
+
+%global		versiontag	2.3-rc5
 
 Name:		nfs-ganesha
 Version:	2.3.0
@@ -86,11 +89,10 @@ License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
 Source0:	 https://github.com/%{name}/%{name}/archive/V%{versiontag}/%{name}-%{versiontag}.tar.gz
-Patch0:		nfs-ganesha-2.3rc4-CMakeLists.txt.patch
 Patch1:		nfs-ganesha-2.3rc3-scripts-ganeshactl-CMakeLists.txt.patch
 
 BuildRequires:	cmake
-BuildRequires:	bison flex
+BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	pkgconfig
 BuildRequires:	krb5-devel
@@ -98,7 +100,9 @@ BuildRequires:	dbus-devel
 BuildRequires:	libcap-devel
 BuildRequires:	libblkid-devel
 BuildRequires:	libuuid-devel
+%if ! %{with ntirpc}
 BuildRequires:	libntirpc-devel >= 1.3.0
+%endif
 Requires:	dbus
 Requires:	nfs-utils
 %if %{with_nfsidmap}
@@ -150,17 +154,6 @@ Requires: nfs-ganesha = %{version}-%{release}
 This package contains a FSAL shared object to
 be used with NFS-Ganesha to support VFS based filesystems
 
-%if %{with nullfs}
-%package nullfs
-Summary: The NFS-GANESHA's NULLFS Stackable FSAL
-Group: Applications/System
-Requires: nfs-ganesha = %{version}-%{release}
-
-%description nullfs
-This package contains a Stackable FSAL shared object to
-be used with NFS-Ganesha. This is mostly a template for future (more sophisticated) stackable FSALs
-%endif
-
 %package proxy
 Summary: The NFS-GANESHA's PROXY FSAL
 Group: Applications/System
@@ -202,6 +195,18 @@ to the ganesha.nfsd server, it makes it possible to trace using LTTng.
 # Option packages start here. use "rpmbuild --with lustre" (or equivalent)
 # for activating this part of the spec file
 
+# NULL
+%if %{with nullfs}
+%package nullfs
+Summary: The NFS-GANESHA's NULLFS Stackable FSAL
+Group: Applications/System
+Requires: nfs-ganesha = %{version}-%{release}
+
+%description nullfs
+This package contains a Stackable FSAL shared object to
+be used with NFS-Ganesha. This is mostly a template for future (more sophisticated) stackable FSALs
+%endif
+
 # GPFS
 %if %{with gpfs}
 %package gpfs
@@ -233,7 +238,8 @@ be used with NFS-Ganesha to support CEPH
 %package lustre
 Summary: The NFS-GANESHA's LUSTRE FSAL
 Group: Applications/System
-Requires: nfs-ganesha = %{version}-%{release}, lustre
+Requires:	nfs-ganesha = %{version}-%{release}
+Requires:	lustre
 BuildRequires:	libattr-devel lustre
 
 %description lustre
@@ -259,7 +265,7 @@ be used with NFS-Ganesha to support LUSTRE via SHOOK
 %package xfs
 Summary: The NFS-GANESHA's XFS FSAL
 Group: Applications/System
-Requires: nfs-ganesha = %{version}-%{release}
+Requires:	nfs-ganesha = %{version}-%{release}
 BuildRequires:	libattr-devel xfsprogs-devel
 
 %description xfs
@@ -272,7 +278,7 @@ to support XFS correctly
 %package hpss
 Summary: The NFS-GANESHA's HPSS FSAL
 Group: Applications/System
-Requires: nfs-ganesha = %{version}-%{release}
+Requires:	nfs-ganesha = %{version}-%{release}
 #BuildRequires:	hpssfs
 
 %description hpss
@@ -285,7 +291,7 @@ be used with NFS-Ganesha to support HPSS
 %package panfs
 Summary: The NFS-GANESHA's PANFS FSAL
 Group: Applications/System
-Requires: nfs-ganesha = %{version}-%{release}
+Requires:	nfs-ganesha = %{version}-%{release}
 
 %description panfs
 This package contains a FSAL shared object to
@@ -299,6 +305,7 @@ Summary: The NFS-GANESHA's PT FSAL
 Group: Applications/System
 Requires: nfs-ganesha = %{version}-%{release}
 
+
 %description pt
 This package contains a FSAL shared object to
 be used with NFS-Ganesha to support PT
@@ -309,7 +316,7 @@ be used with NFS-Ganesha to support PT
 %package gluster
 Summary: The NFS-GANESHA's GLUSTER FSAL
 Group: Applications/System
-Requires: nfs-ganesha = %{version}-%{release}
+Requires:	nfs-ganesha = %{version}-%{release}
 BuildRequires:	glusterfs-api-devel >= 3.7.4
 BuildRequires:	libattr-devel
 BuildRequires:	libacl-devel
@@ -322,7 +329,6 @@ be used with NFS-Ganesha to support Gluster
 %prep
 %setup -q -n %{name}-%{versiontag}
 rm -rf contrib/libzfswrapper
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -393,7 +399,6 @@ install -m 644 scripts/init.d/sysconfig/ganesha		%{buildroot}%{_sysconfdir}/sysc
 %endif
 
 %if %{with pt}
-install -m 755 src/ganesha.pt.init %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha-pt
 install -m 644 src/config_samples/pt.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif
 
@@ -410,18 +415,17 @@ install -m 755 src/config_samples/lustre.conf %{buildroot}%{_sysconfdir}/ganesha
 %endif
 
 %if %{with gpfs}
-install -m 644 src/config_samples/gpfs.conf	%{buildroot}%{_sysconfdir}/ganesha
-install -m 644 src/config_samples/gpfs.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/ganesha
-install -m 644 src/config_samples/gpfs.ganesha.main.conf %{buildroot}%{_sysconfdir}/ganesha
-install -m 644 src/config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/ganesha
-install -m 644 src/config_samples/gpfs.ganesha.exports.conf	%{buildroot}%{_sysconfdir}/ganesha
+install -m 644 config_samples/gpfs.conf %{buildroot}%{_sysconfdir}/ganesha
+install -m 644 config_samples/gpfs.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/ganesha
+install -m 644 config_samples/gpfs.ganesha.main.conf %{buildroot}%{_sysconfdir}/ganesha
+install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/ganesha
+install -m 644 config_samples/gpfs.ganesha.exports.conf	%{buildroot}%{_sysconfdir}/ganesha
 %if ! %{with_systemd}
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
 install -m 755 scripts/init.d/nfs-ganesha.gpfs		%{buildroot}%{_sysconfdir}/init.d/nfs-ganesha-gpfs
 %endif
 %endif
 
-echo "make DESTDIR=%{buildroot} install"
 make DESTDIR=%{buildroot} install
 mv %{buildroot}/share %{buildroot}/usr/
 rm -f %{buildroot}/bin
@@ -448,6 +452,13 @@ rm -f %{buildroot}/lib64
 %license src/LICENSE.txt
 %defattr(-,root,root,-)
 %{_bindir}/ganesha.nfsd
+%if %{with ntirpc}
+%{_libdir}/libntirpc.so.1.3.0
+%{_libdir}/libntirpc.so.1.3
+%{_libdir}/libntirpc.so
+%{_libdir}/pkgconfig/libntirpc.pc
+%{_includedir}/ntirpc/
+%endif
 %config %{_sysconfdir}/dbus-1/system.d/org.ganesha.nfsd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/ganesha
 %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha
@@ -467,7 +478,6 @@ rm -f %{buildroot}/lib64
 %files mount-9P
 %defattr(-,root,root,-)
 %{_sbindir}/mount.9P
-%{_bindir}/*_stats_9pOps
 
 
 %files vfs
@@ -550,7 +560,6 @@ rm -f %{buildroot}/lib64
 %files pt
 %defattr(-,root,root,-)
 %{_libdir}/ganesha/libfsalpt*
-%config(noreplace) %{_sysconfdir}/init.d/nfs-ganesha-pt
 %config(noreplace) %{_sysconfdir}/ganesha/pt.conf
 %endif
 
@@ -571,6 +580,8 @@ rm -f %{buildroot}/lib64
 %{_bindir}/manage_exports
 %{_bindir}/manage_logger
 %{_bindir}/ganeshactl
+%{_bindir}/client_stats_9pOps
+%{_bindir}/export_stats_9pOps
 %endif
 %{_bindir}/fake_recall
 %{_bindir}/get_clientids
@@ -582,6 +593,9 @@ rm -f %{buildroot}/lib64
 %endif
 
 %changelog
+* Mon Oct 5 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.6rc5
+- 2.3.0 RC5
+
 * Mon Sep 28 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.3.0-0.5rc4
 - 2.3.0 RC4
 
diff --git a/sources b/sources
index df6e314..ed18fe5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43733ca09f8e40f8f647d0e5232777a1  nfs-ganesha-2.3-rc4.tar.gz
+0a66bbe84da1c694d1d502669e85ff99  nfs-ganesha-2.3-rc5.tar.gz