diff --git a/quota-SUSE.tar.bz2 b/quota-SUSE.tar.bz2
index 8c3dff1..fb9047f 100644
--- a/quota-SUSE.tar.bz2
+++ b/quota-SUSE.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca503d0bdf408fa19a27bf931e26b3e6b290c0e327af24b82a607a9ddf72e289
-size 3739
+oid sha256:65030214a4cad49bb74ae056ec7f64907c509201ee93d00c56117d6204350194
+size 4034
diff --git a/quota.changes b/quota.changes
index df10223..2532634 100644
--- a/quota.changes
+++ b/quota.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Dec  7 16:35:16 CET 2007 - lmichnovic@suse.cz
+
+- quotad service is not enabled during installation any more
+  [#346541]
+- split off quota-nfs which contains only quotad related files
+- added Requires on packages with services needed to start 
+  quotad service
+- updated README.SUSE and created README.quotad.SUSE
+
 -------------------------------------------------------------------
 Wed Nov 14 16:18:48 CET 2007 - lmichnovic@suse.cz
 
diff --git a/quota.spec b/quota.spec
index 8a0e9cb..526f097 100644
--- a/quota.spec
+++ b/quota.spec
@@ -13,7 +13,7 @@
 Name:           quota
 BuildRequires:  e2fsprogs-devel tcpd-devel
 Version:        3.15
-Release:        27
+Release:        33
 PreReq:         %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 Group:          System/Filesystems
@@ -37,6 +37,29 @@ groups. The kernel must be compiled with disk quota support enabled
 
 
 
+Authors:
+--------
+    Marco van Wieringen <mvw@planets.ow.nl>
+    Johan Ekenberg <johan@ekenberg.nu>
+    Jan Kara <jack@suse.cz>
+
+%package nfs
+Summary:        Disk Quota System on NFS
+Group:          System/Filesystems
+Requires:       quota = %version
+PreReq:         %insserv_prereq %fillup_prereq
+# Require the services needed to be present for quotad service: portmap, nfsserver, network
+Requires:       portmap
+Requires:       nfs-server
+Requires:       sysconfig
+# Split provides
+Provides:       quota:/etc/init.d/quotad
+
+%description nfs
+The quotad init script, which provides quota support on NFS mounts.
+
+
+
 Authors:
 --------
     Marco van Wieringen <mvw@planets.ow.nl>
@@ -80,19 +103,27 @@ ln -s ../../etc/init.d/quotad ${RPM_BUILD_ROOT}/usr/sbin/rcquotad
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{fillup_and_insserv -y boot.quota quotad}
+%{fillup_and_insserv -y boot.quota}
+
+%post nfs
+%{fillup_and_insserv quotad}
 
 %preun
+%stop_on_removal boot.quota
+
+%preun nfs
 %stop_on_removal quotad
 
 %postun
 %{insserv_cleanup}
 
+%postun nfs
+%{insserv_cleanup}
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config /etc/quotagrpadmins
 %config /etc/init.d/boot.quota
-%config /etc/init.d/quotad
 %config /etc/quotatab
 %config /etc/warnquota.conf
 %doc SUSE/README.SUSE README.* doc
@@ -100,7 +131,24 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/*
 %{_bindir}/*
 %{_sbindir}/*
+%exclude %{_sbindir}/rpc.rquotad
+%exclude %{_sbindir}/rcquotad
+
+%files nfs
+%defattr(-,root,root)
+%config /etc/init.d/quotad
+%doc SUSE/README.quotad.SUSE
+%{_sbindir}/rpc.rquotad
+%{_sbindir}/rcquotad
+
 %changelog
+* Fri Dec 07 2007 - lmichnovic@suse.cz
+- quotad service is not enabled during installation any more
+  [#346541]
+- split off quota-nfs which contains only quotad related files
+- added Requires on packages with services needed to start
+  quotad service
+- updated README.SUSE and created README.quotad.SUSE
 * Wed Nov 14 2007 - lmichnovic@suse.cz
 - fixed typo in SUSE/README [#341453] and written additional info
   regarding managing quota support within YaST since openSUSE 10.3