diff --git a/quota.spec b/quota.spec
index 365c11e..570a61e 100644
--- a/quota.spec
+++ b/quota.spec
@@ -4,7 +4,7 @@
 Name: quota
 Epoch: 1
 Version: 4.02
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: System administration tools for monitoring users' disk usage
 # quota_nld.c, quotaio_xfs.h:       GPLv2
 # bylabel.c copied from util-linux: GPLv2+
@@ -17,6 +17,8 @@ URL: http://sourceforge.net/projects/linuxquota/
 Source0: http://downloads.sourceforge.net/linuxquota/%{name}-%{version}.tar.gz
 Source1: quota_nld.service
 Source2: quota_nld.sysconfig
+Source3: rpc-rquotad.service
+Source4: rpc-rquotad.sysconfig
 # Not accepted changes (378a64006bb1e818e84a1c77808563b802b028fa)
 # Some of the lines have been superseded by other commits probably.
 Patch0: quota-4.02-warnquota.patch
@@ -32,6 +34,9 @@ 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
@@ -136,10 +141,23 @@ ln -s  quotaon.8.gz \
 install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/quota_nld.service
 install -p -m644 -D %{SOURCE2} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/quota_nld
+install -p -m644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/rpc-rquotad.service
+install -p -m644 -D %{SOURCE4} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rpc-rquotad
 
 %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
 
@@ -151,6 +169,8 @@ install -p -m644 -D %{SOURCE2} \
 
 
 %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
@@ -190,6 +210,10 @@ install -p -m644 -D %{SOURCE2} \
 
 
 %changelog
+* 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)
+
 * Wed Nov 26 2014 Petr Pisar <ppisar@redhat.com> - 1:4.02-1
 - 4.02 bump
 
diff --git a/rpc-rquotad.service b/rpc-rquotad.service
new file mode 100644
index 0000000..3ec4134
--- /dev/null
+++ b/rpc-rquotad.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Remote quota server
+Documentation=man:rpc.rquotad(8)
+Requires=rpcbind.target
+After=rpcbind.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/sysconfig/rpc-rquotad
+ExecStart=/usr/sbin/rpc.rquotad $RPCRQUOTADOPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/rpc-rquotad.sysconfig b/rpc-rquotad.sysconfig
new file mode 100644
index 0000000..4c67c13
--- /dev/null
+++ b/rpc-rquotad.sysconfig
@@ -0,0 +1,8 @@
+# Optionas to pass to rpc.rquotad daemon. See rpc.rquotad(8) manual page for
+# more details.
+# -I, --autofs          Ignore autofs mount points
+# -p port, --port port  Listen on alternative port
+# -s, --no-setquota     Don't allow setting quotas with RPC (default)
+# -S, --setquota        Allow setting quotas with RPC
+# -x path, --xtab path  Use alternative NFSD export table
+RPCRQUOTADOPTS=""