diff --git a/quota-4.05-warnquota-Clarify-that-CC_TO-gets-resolved-through-L.patch b/quota-4.05-warnquota-Clarify-that-CC_TO-gets-resolved-through-L.patch
new file mode 100644
index 0000000..1e10ffe
--- /dev/null
+++ b/quota-4.05-warnquota-Clarify-that-CC_TO-gets-resolved-through-L.patch
@@ -0,0 +1,33 @@
+From 769f46743d11a4723ef59b018cef0aa6b6c062a6 Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Thu, 12 Sep 2019 10:18:01 +0200
+Subject: [PATCH] warnquota: Clarify that CC_TO gets resolved through LDAP
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Clarify that CC_TO field from warnquota.conf gets resolved through LDAP
+lookup similarly to normal message recifient.
+
+Signed-off-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ warnquota.conf | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/warnquota.conf b/warnquota.conf
+index 60b0672..5bbd0ab 100644
+--- a/warnquota.conf
++++ b/warnquota.conf
+@@ -25,6 +25,8 @@ MAIL_CMD = "/usr/lib/sendmail -t"
+ # Standard mail fields
+ FROM        = "root@localhost"
+ SUBJECT 	= "Your account quota has exceeded!"
++# Note that if LDAP is configured, the name in CC_TO gets looked up in LDAP
++# to obtain email address similarly to email recipient address.
+ CC_TO 		= "root@localhost"
+ # If you set this variable CC will be used only when user has less than
+ # specified grace time left (examples of possible times: 5 seconds, 1 minute,
+-- 
+2.21.0
+
diff --git a/quota.spec b/quota.spec
index bff5844..9bbb3ce 100644
--- a/quota.spec
+++ b/quota.spec
@@ -93,6 +93,9 @@ Patch14: quota-4.05-warnquota-Print-also-additional-error-info-for-LDAP-.patch
 # 2/2 Report detailed LDAP failures, proposed to the upstream,
 # <https://sourceforge.net/p/linuxquota/patches/50/>
 Patch15: quota-4.05-warnquota-Free-LDAP-error-message.patch
+# Document CC_TO in warquota.conf is looked up with LDAP,
+# in upstream after 4.05
+Patch16: quota-4.05-warnquota-Clarify-that-CC_TO-gets-resolved-through-L.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bash
@@ -228,6 +231,7 @@ Linux/UNIX environment.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 # Regenerate build scripts
 autoreconf -f -i
 
@@ -382,6 +386,7 @@ make check
 - Fix warnquota --help output
 - Fix checking for the LDAP failures in the warnquota tool
 - Report detailed LDAP failures
+- Document CC_TO in warquota.conf is looked up with LDAP
 
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild