diff --git a/quota.spec b/quota.spec
index 570a61e..b796bc8 100644
--- a/quota.spec
+++ b/quota.spec
@@ -4,7 +4,7 @@
 Name: quota
 Epoch: 1
 Version: 4.02
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: System administration tools for monitoring users' disk usage
 # quota_nld.c, quotaio_xfs.h:       GPLv2
 # bylabel.c copied from util-linux: GPLv2+
@@ -34,9 +34,6 @@ BuildRequires: systemd
 BuildRequires: tcp_wrappers-devel
 Requires: tcp_wrappers
 Requires: quota-nls = %{epoch}:%{version}-%{release}
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
 Conflicts: kernel < 2.4
 
 %description
@@ -60,6 +57,21 @@ warning messages to the system D-Bus (so that desktop manager can display
 a dialog) and writing them to the terminal user has last accessed.
 
 
+%package rpc
+Group: System Environment/Daemons
+Summary: RPC quota daemon
+Requires: quota-nls = %{epoch}:%{version}-%{release}
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+Conflicts: quota < 1:4.02-3
+
+%description rpc
+The RPC daemon allows to query and set disk quotas over network. If you run
+the deamon on NFS server, you could use quota tools to manage the quotas from
+NFS client.
+
+
 %package warnquota
 Group: System Environment/Base
 Summary: Send e-mail to users over quota
@@ -148,16 +160,6 @@ install -p -m644 -D %{SOURCE4} \
 %find_lang %{name}
 
 
-%post
-%systemd_post rpc-rquotad.service
-
-%preun
-%systemd_preun rpc-rquotad.service
-
-%postun
-%systemd_postun_with_restart rpc-rquotad.service
-
-
 %post nld
 %systemd_post quota_nld.service
 
@@ -168,16 +170,26 @@ install -p -m644 -D %{SOURCE4} \
 %systemd_postun_with_restart quota_nld.service
 
 
+%post rpc
+%systemd_post rpc-rquotad.service
+
+%preun rpc
+%systemd_preun rpc-rquotad.service
+
+%postun rpc
+%systemd_postun_with_restart rpc-rquotad.service
+
+
 %files
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rpc-rquotad
-%{_unitdir}/rpc-rquotad.service
 %attr(0755,root,root) %{_bindir}/*
 %attr(0755,root,root) %{_sbindir}/*
 %exclude %{_sbindir}/quota_nld
+%exclude %{_sbindir}/rpc.rquotad
 %exclude %{_sbindir}/warnquota
 %attr(0644,root,root) %{_mandir}/man1/*
 %attr(0644,root,root) %{_mandir}/man8/*
 %exclude %{_mandir}/man8/quota_nld.8*
+%exclude %{_mandir}/man8/rpc.rquotad.8*
 %exclude %{_mandir}/man8/warnquota.8*
 %doc Changelog
 
@@ -188,6 +200,13 @@ install -p -m644 -D %{SOURCE4} \
 %attr(0644,root,root) %{_mandir}/man8/quota_nld.8*
 %doc Changelog
 
+%files rpc
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rpc-rquotad
+%{_unitdir}/rpc-rquotad.service
+%{_sbindir}/rpc.rquotad
+%{_mandir}/man8/rpc.rquotad.8*
+%doc Changelog
+
 %files warnquota
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/quotagrpadmins
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/quotatab
@@ -210,6 +229,9 @@ install -p -m644 -D %{SOURCE4} \
 
 
 %changelog
+* Thu Apr 02 2015 Petr Pisar <ppisar@redhat.com> - 1:4.02-3
+- Move rpc.rquotad daemon into quota-rpc sub-package
+
 * Thu Apr 02 2015 Petr Pisar <ppisar@redhat.com> - 1:4.02-2
 - Add rpc-rquotad.service file which was known as nfs-rquotad.service
   in nfs-utils (bug #1206260)