diff --git a/30e69471792aec8.patch b/30e69471792aec8.patch
new file mode 100644
index 0000000..2f2c7cb
--- /dev/null
+++ b/30e69471792aec8.patch
@@ -0,0 +1,25 @@
+From 30e69471792aec818dbbfa64adb868db14a6d8e2 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Wed, 18 May 2022 11:31:44 +0300
+Subject: [PATCH] auth: Fix assert-crash in iterating multiple userdbs
+
+Broken by 501e17ba6b448ba3c88338596e0e8f99f0693f79
+
+Fixes:
+Panic: file userdb-blocking.c: line 125 (userdb_blocking_iter_next): assertion failed: (ctx->conn != NULL)
+---
+ src/auth/auth-master-connection.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/auth/auth-master-connection.c b/src/auth/auth-master-connection.c
+index 02eb11d38e..3f439b861a 100644
+--- a/src/auth/auth-master-connection.c
++++ b/src/auth/auth-master-connection.c
+@@ -514,7 +514,6 @@ static void master_input_list_callback(const char *user, void *context)
+ 		ctx->auth_request->userdb = userdb;
+ 		ctx->iter = userdb_blocking_iter_init(ctx->auth_request,
+ 					master_input_list_callback, ctx);
+-		userdb_blocking_iter_next(ctx->iter);
+ 		return;
+ 	}
+ 
diff --git a/dovecot-2.3.15-fixvalcond.patch b/dovecot-2.3.15-fixvalcond.patch
index 6711010..fc37561 100644
--- a/dovecot-2.3.15-fixvalcond.patch
+++ b/dovecot-2.3.15-fixvalcond.patch
@@ -1,6 +1,6 @@
-diff -up dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c
---- dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond	2021-11-02 21:51:36.109032050 +0100
-+++ dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.18/src/lib-sieve/storage/dict/sieve-dict-script.c	2021-11-02 21:52:28.409344118 +0100
+diff -up dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.19/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.19/src/lib-sieve/storage/dict/sieve-dict-script.c
+--- dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.19/src/lib-sieve/storage/dict/sieve-dict-script.c.fixvalcond	2021-11-02 21:51:36.109032050 +0100
++++ dovecot-2.3.17/dovecot-2.3-pigeonhole-0.5.19/src/lib-sieve/storage/dict/sieve-dict-script.c	2021-11-02 21:52:28.409344118 +0100
 @@ -114,7 +114,7 @@ static int sieve_dict_script_get_stream
  		(struct sieve_dict_script *)script;
  	struct sieve_dict_storage *dstorage =
diff --git a/dovecot.spec b/dovecot.spec
index 770a174..c2d987d 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -4,7 +4,7 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.3.18
+Version: 2.3.19
 %global prever %{nil}
 Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
@@ -14,7 +14,7 @@ URL: https://www.dovecot.org/
 Source: https://www.dovecot.org/releases/2.3/%{name}-%{version}%{?prever}.tar.gz
 Source1: dovecot.init
 Source2: dovecot.pam
-%global pigeonholever 0.5.18
+%global pigeonholever 0.5.19
 Source8: https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz
 Source9: dovecot.sysconfig
 Source10: dovecot.tmpfilesd
@@ -44,6 +44,7 @@ Patch16: dovecot-2.3.6-opensslhmac.patch
 Patch17: dovecot-2.3.15-fixvalcond.patch
 Patch18: dovecot-2.3.15-valbasherr.patch
 Patch20: dovecot-2.3.14-opensslv3.patch
+Patch21:	30e69471792aec8.patch
 
 Source15: prestartscript
 
@@ -141,6 +142,7 @@ This package provides the development files for dovecot.
 %patch17 -p1 -b .fixvalcond
 %patch18 -p1 -b .valbasherr
 %patch20 -p1 -b .opensslv3
+%patch21 -p1 -b .30e69471792aec8
 cp run-test-valgrind.supp dovecot-2.3-pigeonhole-%{pigeonholever}/
 # valgrind would fail with shell wrapper
 echo "testsuite" >dovecot-2.3-pigeonhole-%{pigeonholever}/run-test-valgrind.exclude
@@ -469,6 +471,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Mon May 30 2022 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.19-1
+- updated to 2.3.19, pigeonhole to 0.5.19
+
 * Wed Feb 09 2022 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.18-1
 - updated to 2.3.18, pigeonhole to 0.5.18
 
diff --git a/sources b/sources
index d434056..5ee52a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dovecot-2.3.18.tar.gz) = b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
-SHA512 (dovecot-2.3-pigeonhole-0.5.18.tar.gz) = 44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec
+SHA512 (dovecot-2.3.19.tar.gz) = a61ce88b53c4f24faddf4951f16cb75dfe52aa7057d072c727566a7c9a683cc487d26cea9a83ad8aca161a053949d2f2196ba6a58015e3d33be897094aabf887
+SHA512 (dovecot-2.3-pigeonhole-0.5.19.tar.gz) = 5b0a61c7711232ea3651b818a970b500b05bd340a04bcd5a5f0ea0529eda65f498912a845c8f3b3b80196d010bc22bd4a380e1f682cb42f62b80d2d43a94993a