diff --git a/quota-4.05-warnquota-Fix-help-text.patch b/quota-4.05-warnquota-Fix-help-text.patch
new file mode 100644
index 0000000..0e812c5
--- /dev/null
+++ b/quota-4.05-warnquota-Fix-help-text.patch
@@ -0,0 +1,33 @@
+From 1ae10f8692981285ad52af9e9ae3e5f16201b187 Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Mon, 12 Aug 2019 16:31:31 +0200
+Subject: [PATCH] warnquota: Fix help text
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The help text was wrongly saying that -v is equivalent to --version.
+It should be -V.
+
+Signed-off-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ warnquota.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/warnquota.c b/warnquota.c
+index 5158094..606b7cc 100644
+--- a/warnquota.c
++++ b/warnquota.c
+@@ -1042,7 +1042,7 @@ static void usage(void)
+ -q, --quota-tab=quotatab-file   non-default quotatab\n\
+ -a, --admins-file=admins-file   non-default admins file\n\
+ -h, --help                      display this help message and exit\n\
+--v, --version                   display version information and exit\n\n"));
++-V, --version                   display version information and exit\n\n"));
+ 	errstr(_("Bugs to %s\n"), PACKAGE_BUGREPORT);
+ 	wc_exit(1);
+ }
+-- 
+2.21.0
+
diff --git a/quota.spec b/quota.spec
index 0b2dae9..f964b6e 100644
--- a/quota.spec
+++ b/quota.spec
@@ -83,6 +83,8 @@ Patch10: quota-4.05-Make-a-directory-for-quota_nld-PID-file-configurable.patch
 # Optimize out useless checking of file systems with hidden quota files,
 # in upstream after 4.05
 Patch11: quota-4.05-quotacheck-Skip-checking-of-filesystems-with-hidded-.patch
+# Fix warnquota --help output, in upstream after 4.05
+Patch12: quota-4.05-warnquota-Fix-help-text.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bash
@@ -214,6 +216,7 @@ Linux/UNIX environment.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 # Regenerate build scripts
 autoreconf -f -i
 
@@ -365,6 +368,7 @@ make check
 %changelog
 * Tue Nov 05 2019 Petr Pisar <ppisar@redhat.com> - 1:4.05-6
 - Optimize out useless checking of file systems with hidden quota files
+- Fix warnquota --help output
 
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild