diff --git a/quota-SUSE.tar.bz2 b/quota-SUSE.tar.bz2
index feddf13..1608b85 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:60c09f9ff1d62cc00a5dc3a75f189bb6e5063d04dd0e4926eadbc2795835b66c
-size 4259
+oid sha256:e22ee70bfc6fd7b62037ecff19758080dc88ceee94714e0ade9d850feb897c57
+size 4321
diff --git a/quota.changes b/quota.changes
index 1202ee7..f44b85f 100644
--- a/quota.changes
+++ b/quota.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb 18 10:46:04 UTC 2011 - vcizek@novell.com
+
+- disabled autostart of quota-nfs service after installation, 
+  as stated in documentation
+
+-------------------------------------------------------------------
+Thu Feb 17 12:52:33 UTC 2011 - vcizek@novell.com
+
+- moved port settings to sysconfig/nfs (bnc#637382)
+
 -------------------------------------------------------------------
 Thu Sep  9 16:59:51 CEST 2010 - anicka@suse.cz
 
diff --git a/quota.spec b/quota.spec
index d8ea86b..ff41464 100644
--- a/quota.spec
+++ b/quota.spec
@@ -111,16 +111,16 @@ cp SUSE/{quotad,boot.quota} ${RPM_BUILD_ROOT}/etc/init.d
 #ln -s ../../etc/init.d/quota  ${RPM_BUILD_ROOT}/usr/sbin/rcquota
 ln -s ../../etc/init.d/quotad ${RPM_BUILD_ROOT}/usr/sbin/rcquotad
 %find_lang %{name}
-cp SUSE/rquotad.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.rquotad
+cp SUSE/sysconfig.nfs-quota $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.nfs-quota
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{fillup_and_insserv -f -y boot.quota}
+%{fillup_and_insserv -f -y boot.quota} 
 
 %post nfs
-%{fillup_and_insserv -n rquotad quotad}
+%{fillup_only -an nfs}
 
 %preun
 %stop_on_removal boot.quota
@@ -154,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc SUSE/README.quotad.SUSE
 %{_sbindir}/rpc.rquotad
 %{_sbindir}/rcquotad
-/var/adm/fillup-templates/sysconfig.rquotad
+%{_localstatedir}/adm/fillup-templates/sysconfig.nfs-quota
 # these files conflicts with glibc rpm
 %exclude /usr/include/rpcsvc/*