diff --git a/SOURCES/cyrus-imapd-squatter-assert-crash.patch b/SOURCES/cyrus-imapd-squatter-assert-crash.patch
new file mode 100644
index 0000000..99f7996
--- /dev/null
+++ b/SOURCES/cyrus-imapd-squatter-assert-crash.patch
@@ -0,0 +1,20 @@
+diff --git a/imap/squatter.c b/imap/squatter.c
+index 4419379..d00f003 100644
+--- a/imap/squatter.c
++++ b/imap/squatter.c
+@@ -408,8 +408,13 @@ static void expand_mboxnames(strarray_t *sa, int nmboxnames,
+         else {
+             /* Translate any separators in mailboxname */
+             char *intname = mboxname_from_external(mboxnames[i], &squat_namespace, NULL);
+-            int flags = recursive_flag ? 0 : MBOXTREE_SKIP_CHILDREN;
+-            mboxlist_mboxtree(intname, addmbox, sa, flags);
++            if (!intname || *intname == '\0') {
++                fprintf(stderr, "Mailbox %s: %s\n",
++                        mboxnames[i], error_message(IMAP_MAILBOX_BADNAME));
++            } else {
++                int flags = recursive_flag ? 0 : MBOXTREE_SKIP_CHILDREN;
++                mboxlist_mboxtree(intname, addmbox, sa, flags);
++            }
+             free(intname);
+         }
+ 
diff --git a/SPECS/cyrus-imapd.spec b/SPECS/cyrus-imapd.spec
index 29a1355..f86be90 100644
--- a/SPECS/cyrus-imapd.spec
+++ b/SPECS/cyrus-imapd.spec
@@ -14,7 +14,7 @@
 
 Name: cyrus-imapd
 Version: 3.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
@@ -57,6 +57,8 @@ Patch4: patch-cyrus-perl-linking
 
 Patch5: cyrus-imapd-CVE-2021-33582.patch
 Patch6: fix-broken-delivery-to-shared-mailboxes.patch
+# https://github.com/cyrusimap/cyrus-imapd/pull/3892
+Patch7: cyrus-imapd-squatter-assert-crash.patch
 
 Source10: cyrus-imapd.logrotate
 Source11: cyrus-imapd.pam-config
@@ -662,6 +664,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Wed Aug 17 2022 Martin Osvald <mosvald@redhat.com> - 3.4.1-7
+- Resolves: #2096149 - Fatal error when running "squatter -r user"
+- Resolves: #2096885 - Enhanced TMT testing for centos-stream
+
 * Wed Nov 24 2021 Martin Osvald <mosvald@redhat.com> - 3.4.1-6
 - Sending email with /usr/lib/cyrus-imapd/deliver fails with code 75
 - Resolves: #2021532
@@ -727,7 +733,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Tue Jan 12 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4
+* Tue Jan 12 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4
 - Drop clamav BR for eln
 
 * Mon Dec 14 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-3