diff --git a/quota.spec b/quota.spec
index b5f12bc..ca0bd0b 100644
--- a/quota.spec
+++ b/quota.spec
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 3.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -21,6 +21,7 @@ Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
 Patch5: quota-3.16-formatstring.patch
 Patch6: quota-3.16-helpoption.patch
+Patch7: quota-3.16-upstreampatches.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -38,6 +39,7 @@ and limiting user and or group disk usage per filesystem.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -95,6 +97,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 27 2008 Ondrej Vasik <ovasik@redhat.com> 3.16-4
+- fix bug in warnquota which could result in bogus hostname
+  and domainname (upstream)
+- remove IMMUTABLE flag from quota file in quotacheck(upstream)
+
 * Tue Aug 05 2008 Ondrej Vasik <ovasik@redhat.com> 3.16-3
 - Add support for -h option (do not show invalid option
   error) at edquota,setquota and quota (#457898)