diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index a1004a4..6f10706 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -84,12 +84,16 @@ Requires: openSUSE-release
 %bcond_without man_page
 %global use_man_page %{on_off_switch man_page}
 
+%if ( 0%{?rhel} && 0%{?rhel} < 7 )
+%global _rundir %{_localstatedir}/run
+%endif
 
+%global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print(s2) }
 # %%global	dev final
 # %%global	dash_dev_version 2.5-final
 
 Name:		nfs-ganesha
-Version:	2.5.1.1
+Version:	2.5.2
 Release:	1%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 Group:		Applications/System
@@ -117,6 +121,8 @@ BuildRequires:	libuuid-devel
 BuildRequires:	gcc-c++
 %if %{with system_ntirpc}
 BuildRequires:	libntirpc-devel >= 1.5.3
+%else
+Requires: libntirpc = @NTIRPC_VERSION_EMBED@
 %endif
 %if ( 0%{?fedora} )
 # this should effectively be a no-op, as all Fedora installs should have it
@@ -339,6 +345,44 @@ This package contains a FSAL shared object to
 be used with NFS-Ganesha to support Gluster
 %endif
 
+# NTIRPC (if built-in)
+%if ! %{with system_ntirpc}
+%package -n libntirpc
+Summary:	New Transport Independent RPC Library
+Group:		System Environment/Libraries
+License:	BSD
+Version:	@NTIRPC_VERSION_EMBED@
+Url:		https://github.com/nfs-ganesha/ntirpc
+
+# libtirpc has /etc/netconfig, most machines probably have it anyway
+# for NFS client
+Requires:	libtirpc
+
+%description -n libntirpc
+This package contains a new implementation of the original libtirpc,
+transport-independent RPC (TI-RPC) library for NFS-Ganesha. It has
+the following features not found in libtirpc:
+ 1. Bi-directional operation
+ 2. Full-duplex operation on the TCP (vc) transport
+ 3. Thread-safe operating modes
+ 3.1 new locking primitives and lock callouts (interface change)
+ 3.2 stateless send/recv on the TCP transport (interface change)
+ 4. Flexible server integration support
+ 5. Event channels (remove static arrays of xprt handles, new EPOLL/KEVENT
+    integration)
+
+%package -n libntirpc-devel
+Summary:	Development headers for libntirpc
+Requires:	libntirpc = @NTIRPC_VERSION_EMBED@
+Group:		System Environment/Libraries
+License:	BSD
+Version:	@NTIRPC_VERSION_EMBED@
+Url:		https://github.com/nfs-ganesha/ntirpc
+
+%description -n libntirpc-devel
+Development headers and auxiliary files for developing with %{name}.
+%endif
+
 %prep
 %setup -q -n %{name}-%{version}
 rm -rf contrib/libzfswrapper
@@ -381,14 +425,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_libdir}/ganesha
-mkdir -p %{buildroot}%{_localstatedir}/run/ganesha
+mkdir -p %{buildroot}%{_rundir}/ganesha
 mkdir -p %{buildroot}%{_libexecdir}/ganesha
 cd src
 install -m 644 config_samples/logrotate_ganesha	%{buildroot}%{_sysconfdir}/logrotate.d/ganesha
 install -m 644 scripts/ganeshactl/org.ganesha.nfsd.conf	%{buildroot}%{_sysconfdir}/dbus-1/system.d
 install -m 755 scripts/nfs-ganesha-config.sh	%{buildroot}%{_libexecdir}/ganesha
 install -m 755 tools/mount.9P	%{buildroot}%{_sbindir}/mount.9P
-
 install -m 644 config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha
 %if %{with rgw}
 install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha
@@ -458,7 +501,7 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || :
 
 %pre
 getent group ganesha > /dev/null || groupadd -r ganesha
-getent passwd ganesha > /dev/null || useradd -r -g ganesha -d /var/run/ganesha -s /sbin/nologin -c "NFS-Ganesha Daemon" ganesha
+getent passwd ganesha > /dev/null || useradd -r -g ganesha -d %{_rundir}/ganesha -s /sbin/nologin -c "NFS-Ganesha Daemon" ganesha
 exit 0
 
 %preun
@@ -483,13 +526,6 @@ exit 0
 %files
 %license src/LICENSE.txt
 %{_bindir}/ganesha.nfsd
-%if ! %{with system_ntirpc}
-%{_libdir}/libntirpc.so.1.5.0
-%{_libdir}/libntirpc.so.1.5
-%{_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
@@ -498,7 +534,7 @@ exit 0
 %dir %{_defaultdocdir}/ganesha/
 %{_defaultdocdir}/ganesha/*
 %doc src/ChangeLog
-%dir %{_localstatedir}/run/ganesha
+%dir %{_rundir}/ganesha
 %dir %{_libexecdir}/ganesha/
 %{_libexecdir}/ganesha/nfs-ganesha-config.sh
 %dir %attr(0755,ganesha,ganesha) %{_localstatedir}/log/ganesha
@@ -609,6 +645,21 @@ exit 0
 %endif
 %endif
 
+%if ! %{with system_ntirpc}
+%files -n libntirpc
+%defattr(-,root,root,-)
+%{_libdir}/libntirpc.so.@NTIRPC_VERSION_EMBED@
+%{_libdir}/libntirpc.so.1.5
+%{_libdir}/libntirpc.so
+%{!?_licensedir:%global license %%doc}
+%license libntirpc/COPYING
+%doc libntirpc/NEWS libntirpc/README
+%files -n libntirpc-devel
+%{_libdir}/pkgconfig/libntirpc.pc
+%dir %{_includedir}/ntirpc
+%{_includedir}/ntirpc/*
+%endif
+
 %if %{with panfs}
 %files panfs
 %{_libdir}/ganesha/libfsalpanfs*
@@ -649,6 +700,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 25 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.2-1
+- nfs-ganesha 2.5.2 GA
+
+* Fri Aug 18 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.1.1-2
+- /var/run -> /run
+
 * Wed Aug 2 2017 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.5.1.1-1
 - nfs-ganesha 2.5.1.1 GA
 - enable ppc64, enable FSAL_GPFS
diff --git a/sources b/sources
index 454c50d..482b8f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nfs-ganesha-2.5.1.1.tar.gz) = 433cbb718af0fdbeaab093a26ce4867bb7e6eb3d53525a30cba448625e66c9da9a93b558886d9d037f1b7a7eca483c226f77863f7f528591866eb38a1f1b8ad7
+SHA512 (nfs-ganesha-2.5.2.tar.gz) = 06e87cee4944ceb22da59e0d09bdafcebce34677b86af04f0cc259b165fa71afbadf1bc7f879353ad7a44af8d8080dc97f9463d128938dae5bf8a91635c729dd