diff --git a/quota-3.16-helpoption.patch b/quota-3.16-helpoption.patch
new file mode 100644
index 0000000..33389c4
--- /dev/null
+++ b/quota-3.16-helpoption.patch
@@ -0,0 +1,60 @@
+diff -urNp quota-tools-orig/edquota.c quota-tools/edquota.c
+--- quota-tools-orig/edquota.c	2008-08-05 13:37:34.000000000 +0200
++++ quota-tools/edquota.c	2008-08-05 13:46:42.000000000 +0200
+@@ -130,9 +130,9 @@ int parse_options(int argc, char **argv)
+ 
+ 	quotatype = USRQUOTA;
+ #if defined(RPC_SETQUOTA)
+-	while ((ret = getopt_long(argc, argv, "ugrmntTVp:F:f:", long_opts, NULL)) != -1) {
++	while ((ret = getopt_long(argc, argv, "ughrmntTVp:F:f:", long_opts, NULL)) != -1) {
+ #else
+-	while ((ret = getopt_long(argc, argv, "ugtTVp:F:f:", long_opts, NULL)) != -1) {
++	while ((ret = getopt_long(argc, argv, "ughtTVp:F:f:", long_opts, NULL)) != -1) {
+ #endif
+ 		switch (ret) {
+ 		  case 'p':
+@@ -172,6 +172,7 @@ int parse_options(int argc, char **argv)
+ 		  case 'V':
+ 			  version();
+ 			  exit(0);
++		  case 'h':
+ 		  default:
+ 			  usage();
+ 		}
+diff -urNp quota-tools-orig/quota.c quota-tools/quota.c
+--- quota-tools-orig/quota.c	2008-08-05 13:37:34.000000000 +0200
++++ quota-tools/quota.c	2008-08-05 13:41:45.000000000 +0200
+@@ -270,7 +270,7 @@ int main(int argc, char **argv)
+ 	gettexton();
+ 	progname = basename(argv[0]);
+ 
+-	while ((ret = getopt_long(argc, argv, "guqvsVliQF:wfApm", long_opts, NULL)) != -1) {
++	while ((ret = getopt_long(argc, argv, "ghuqvsVliQF:wfApm", long_opts, NULL)) != -1) {
+ 		switch (ret) {
+ 		  case 'g':
+ 			  flags |= FL_GROUP;
+@@ -321,7 +321,8 @@ int main(int argc, char **argv)
+ 		  case 'V':
+ 			  version();
+ 			  exit(0);
+-		  default:
++		  case 'h':
++      default:
+ 			  usage();
+ 		}
+ 	}
+diff -urNp quota-tools-orig/setquota.c quota-tools/setquota.c
+--- quota-tools-orig/setquota.c	2008-08-05 13:37:34.000000000 +0200
++++ quota-tools/setquota.c	2008-08-05 13:45:48.000000000 +0200
+@@ -107,9 +107,9 @@ static void parse_options(int argcnt, ch
+ 	char *protoname = NULL;
+ 
+ #ifdef RPC_SETQUOTA
+-	char *opts = "gp:urmVF:taTbc";
++	char *opts = "ghp:urmVF:taTbc";
+ #else
+-	char *opts = "gp:uVF:taTbc";
++	char *opts = "ghp:uVF:taTbc";
+ #endif
+ 	struct option long_opts[] = {
+ 		{ "user", 0, NULL, 'u' },
diff --git a/quota.spec b/quota.spec
index 3a555c7..b5f12bc 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: 2%{?dist}
+Release: 3%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -20,6 +20,7 @@ Patch2: quota-3.06-man-page.patch
 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
 
 %description
 The quota package contains system administration tools for monitoring
@@ -36,6 +37,7 @@ and limiting user and or group disk usage per filesystem.
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 #fix typos/mistakes in localized documentation
 for pofile in $(find ./po/*.p*)
@@ -93,6 +95,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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)
+
 * Fri Jun 20 2008 Ondrej Vasik <ovasik@redhat.com> 3.16-2
 - upstream fix of some typos, string formats + 4TB+ fix
   for repquota