diff --git a/courier-imap-5.0.10.tar.bz2 b/courier-imap-5.0.10.tar.bz2
new file mode 100644
index 0000000..542020f
--- /dev/null
+++ b/courier-imap-5.0.10.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5522a14695f6bb710a723fd92ae2ccc0771c1c2b71c7ba6b4d8b4e6f6fb78f96
+size 3324560
diff --git a/courier-imap-5.0.10.tar.bz2.sig b/courier-imap-5.0.10.tar.bz2.sig
new file mode 100644
index 0000000..f95ea91
Binary files /dev/null and b/courier-imap-5.0.10.tar.bz2.sig differ
diff --git a/courier-imap-5.0.8.tar.bz2 b/courier-imap-5.0.8.tar.bz2
deleted file mode 100644
index 7e4e019..0000000
--- a/courier-imap-5.0.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6de26c96f92c50f83af4e9e4b5a5d7d4e55031fb42a8b1229d4f05904c1bb2d4
-size 3296810
diff --git a/courier-imap-5.0.8.tar.bz2.sig b/courier-imap-5.0.8.tar.bz2.sig
deleted file mode 100644
index 7c58671..0000000
Binary files a/courier-imap-5.0.8.tar.bz2.sig and /dev/null differ
diff --git a/courier-imap-stdc.patch b/courier-imap-stdc.patch
new file mode 100644
index 0000000..a90dd21
--- /dev/null
+++ b/courier-imap-stdc.patch
@@ -0,0 +1,39 @@
+Index: libs/rfc1035/rfc1035udp.c
+===================================================================
+--- libs/rfc1035/rfc1035udp.c.orig
++++ libs/rfc1035/rfc1035udp.c
+@@ -69,13 +69,15 @@
+ 				 const unsigned *querylens,
+ 				 int n_queries)
+ {
++	int n;
++
+ 	struct rfc1035_udp_query_responses *resps =
+ 		rfc1035_udp_query_response_alloc_common(n_queries);
+ 
+ 	if (!resps)
+ 		return 0;
+ 
+-	for (int n=0; n<n_queries; ++n)
++	for (n=0; n<n_queries; ++n)
+ 	{
+ 		resps->queries[n].query=queries[n];
+ 		resps->queries[n].querylen=querylens[n];
+@@ -89,6 +91,8 @@
+ rfc1035_udp_query_response_alloc_bis(struct querybuf *queries,
+ 				 int n_queries)
+ {
++	int n;
++
+ 	struct rfc1035_udp_query_responses *resps =
+ 		rfc1035_udp_query_response_alloc_common(n_queries);
+ 
+@@ -96,7 +100,7 @@
+ 		return 0;
+ 
+ 
+-	for (int n=0; n<n_queries; ++n)
++	for (n=0; n<n_queries; ++n)
+ 	{
+ 		resps->queries[n].query=queries[n].qbuf;
+ 		resps->queries[n].querylen=queries[n].qbuflen;
diff --git a/courier-imap.changes b/courier-imap.changes
index 0973361..6399ee0 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu May 28 11:44:19 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
+
+- update to 5.0.10 
+  * tcpd/starttls.c (dossl): Start client after negotiating SSL, in
+    order to allow EXTERNAL client certificate authentication.
+  * Fix virtual IP and hostname handling when using GnuTLS for SSL.
+  * imap, pop3: include remote port TCP port number together with the
+    IP address, in log messages.
+- add courier-imap-stdc.patch to remove 'for' loop initial declarations
+
 -------------------------------------------------------------------
 Tue Nov 12 15:23:15 UTC 2019 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 6a09fa9..8252b5d 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package courier-imap
 #
-# Copyright (c) 2019 SUSE LLC.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           courier-imap
-Version:        5.0.8
+Version:        5.0.10
 Release:        0
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 License:        GPL-3.0-or-later
@@ -44,6 +44,8 @@ Patch2:         %{name}-ulimit_conf.patch
 ### Patch for upstream:
 ## fixes typo in Makefile.am
 Patch3:         %{name}-Makefile.patch
+# PATCH-FIX-SLE courier-imap-stdc.patch - rewrite C99 construction to C89 as GCC 4.8 doesn't enable C99 by default
+Patch4:         %{name}-stdc.patch
 BuildRequires:  audit-libs
 BuildRequires:  courier-authlib-devel >= 0.68
 BuildRequires:  courier-unicode-devel >= 2.0
@@ -101,6 +103,7 @@ install the entire Courier server.
 %patch0
 %patch2
 %patch3
+%patch4
 
 %build
 %configure \