diff --git a/courier-imap-5.1.4.tar.bz2 b/courier-imap-5.1.4.tar.bz2
deleted file mode 100644
index 1abb2c8..0000000
--- a/courier-imap-5.1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6f30f0fadd4fce2e55c12181ba84334bd5fbc4d45f09419070a50d219da0167
-size 3363196
diff --git a/courier-imap-5.1.4.tar.bz2.sig b/courier-imap-5.1.4.tar.bz2.sig
deleted file mode 100644
index a697984..0000000
Binary files a/courier-imap-5.1.4.tar.bz2.sig and /dev/null differ
diff --git a/courier-imap-5.1.7.tar.bz2 b/courier-imap-5.1.7.tar.bz2
new file mode 100644
index 0000000..ed4d5fa
--- /dev/null
+++ b/courier-imap-5.1.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf37754425993d7b15b2e72b0af6061e41d320bc598c9c62e086d650f71152df
+size 3364221
diff --git a/courier-imap-5.1.7.tar.bz2.sig b/courier-imap-5.1.7.tar.bz2.sig
new file mode 100644
index 0000000..764c1c3
Binary files /dev/null and b/courier-imap-5.1.7.tar.bz2.sig differ
diff --git a/courier-imap.changes b/courier-imap.changes
index ae019b1..89bbcc0 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Jan 17 07:29:18 UTC 2022 - Arjen de Korte <suse+build@de-korte.org>
+
+- update to 5.1.7
+  * Fix linking failure on some Linux distributions.
+
+- update to 5.1.6
+  * Fix linking failure on some Linux distributions.
+
+- update to 5.1.5
+  * Fix minor memory leaks. If valgrind is installed, "make check" will
+    run it to check for memory leaks.
+  * Convert to PCRE2.
+  * libcouriertls: use ALARM to kill couriertls if the server process
+    terminates but openssl hangs trying to shut down the socket.
+
 -------------------------------------------------------------------
 Mon Aug  2 09:16:44 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 7053bc5..b910249 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package courier-imap
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,10 @@
 #
 
 
+%bcond_with     valgrind
+
 Name:           courier-imap
-Version:        5.1.4
+Version:        5.1.7
 Release:        0
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 License:        GPL-3.0-or-later
@@ -48,13 +50,15 @@ BuildRequires:  gcc-c++
 BuildRequires:  gdbm-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  ncurses-devel
-# openssl itself for /usr/bin/openssl configure check
-BuildRequires:  postfix
+BuildRequires:  pcre2-devel
 BuildRequires:  procps
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libidn)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(systemd)
+%if %{with valgrind}
+BuildRequires:  valgrind
+%endif
 Requires:       courier-authlib >= 0.71
 Requires:       gdbm
 Requires:       openssl
@@ -113,7 +117,10 @@ mv libs/maildir/README.maildirquota{.txt,}
 	--with-authdaemonvar=%{_rundir}/courier-authlib \
 	--with-certdb=%{_sysconfdir}/ssl/certs \
 	--with-certsdir=%{_sysconfdir}/ssl/private \
+%if %{without valgrind}
 	--enable-workarounds-for-imap-client-bugs
+%endif
+
 %make_build
 
 %install
@@ -149,6 +156,11 @@ EOF
 # SSL state cache directory
 install -d %{buildroot}%{_localstatedir}/cache/%{name}/
 
+%if %{with valgrind}
+%check
+make check
+%endif
+
 %pre
 %service_add_pre courier-imap-gencert.service courier-imap-ssl.service courier-imap.service
 %service_add_pre courier-pop-gencert.service courier-pop-ssl.service courier-pop.service