diff --git a/courier-imap-5.0.14.tar.bz2 b/courier-imap-5.0.14.tar.bz2
deleted file mode 100644
index 3df9206..0000000
--- a/courier-imap-5.0.14.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:671a6a64c2d46e515097979b4488b8284d0260eabdff56ff81ef66cf1f6169c3
-size 3359363
diff --git a/courier-imap-5.0.14.tar.bz2.sig b/courier-imap-5.0.14.tar.bz2.sig
deleted file mode 100644
index 93259b5..0000000
Binary files a/courier-imap-5.0.14.tar.bz2.sig and /dev/null differ
diff --git a/courier-imap-5.1.0.tar.bz2 b/courier-imap-5.1.0.tar.bz2
new file mode 100644
index 0000000..ee9fe57
--- /dev/null
+++ b/courier-imap-5.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:747a1797820f72a7007e6e8ad3e77b773d933a2c751a87bcfa74a1f918d3571e
+size 3360871
diff --git a/courier-imap-5.1.0.tar.bz2.sig b/courier-imap-5.1.0.tar.bz2.sig
new file mode 100644
index 0000000..48d0db6
Binary files /dev/null and b/courier-imap-5.1.0.tar.bz2.sig differ
diff --git a/courier-imap-Makefile.patch b/courier-imap-Makefile.patch
deleted file mode 100644
index fa32756..0000000
--- a/courier-imap-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: Makefile.am
-===================================================================
---- Makefile.am.orig
-+++ Makefile.am
-@@ -160,7 +160,7 @@ install-exec-hook:
- 	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
- 	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
- 	mkdir -p $(DESTDIR)$(sysconfdir)/imapaccess
--	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
-+	chmod 755 $(DESTDIR)$(sysconfdir)/imapaccess
- 
- install-data-local: install-man
- 	test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig
-+++ Makefile.in
-@@ -1449,7 +1449,7 @@ install-exec-hook:
- 	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
- 	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
- 	mkdir -p $(DESTDIR)$(sysconfdir)/imapaccess
--	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
-+	chmod 755 $(DESTDIR)$(sysconfdir)/imapaccess
- 
- install-data-local: install-man
- 	test -d $(DESTDIR)/etc/pam.d || exit 0 ; \
diff --git a/courier-imap-config.patch b/courier-imap-config.patch
index d28167a..3df2adb 100644
--- a/courier-imap-config.patch
+++ b/courier-imap-config.patch
@@ -48,7 +48,7 @@ diff -purN libs/imap/imapd-ssl.dist.in libs/imap/imapd-ssl.dist.in
 +TLS_CACHEFILE=@localstatedir@/cache/courier-imap/sslpop3cache
  TLS_CACHESIZE=524288
  
- ##NAME: MAILDIRPATH:0
+ ##NAME: TLS_ALPN:0
 diff -purN libs/imap/pop3d.dist.in libs/imap/pop3d.dist.in
 --- libs/imap/pop3d.dist.in	2021-03-01 13:29:08.000000000 +0100
 +++ libs/imap/pop3d.dist.in	2021-03-02 08:31:18.846600632 +0100
@@ -81,4 +81,4 @@ diff -purN libs/imap/pop3d-ssl.dist.in libs/imap/pop3d-ssl.dist.in
 +TLS_CACHEFILE=@localstatedir@/cache/courier-imap/sslimapcache
  TLS_CACHESIZE=524288
  
- ##NAME: MAILDIRPATH:0
+ ##NAME: TLS_ALPN:0
diff --git a/courier-imap.changes b/courier-imap.changes
index 53e1ca9..a53379c 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Mar 20 10:03:07 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
+
+- update to 5.1.0
+  * Implement support for the TLS ALPN extension.
+  * Replace FAM/Gamin with inotify.
+  * Install the maildirwatch tool.
+  * Remove the IMAP_ENHANCEDIDLE setting from the imapd configuration
+    file.
+
+- update source download URL
+- remove courier-imap-Makefile.patch (upstreamed)
+
 -------------------------------------------------------------------
 Tue Mar  2 07:36:29 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 1892dd6..19a1001 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -17,14 +17,14 @@
 
 
 Name:           courier-imap
-Version:        5.0.14
+Version:        5.1.0
 Release:        0
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 License:        GPL-3.0-or-later
 Group:          Productivity/Networking/Email/Servers
 URL:            https://www.courier-mta.org/imap/
-Source0:        https://downloads.sourceforge.net/project/courier/imap/%{version}/%{name}-%{version}.tar.bz2
-Source1:        https://downloads.sourceforge.net/project/courier/imap/%{version}/%{name}-%{version}.tar.bz2.sig
+Source0:        https://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
+Source1:        https://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2.sig
 Source2:        pop3.pamd
 Source3:        imap.pamd
 # Keyring downloaded from https://www.courier-mta.org/KEYS.bin#/%%{name}.keyring
@@ -38,28 +38,24 @@ Source20:       courier-pop-gencert.service
 Patch0:         %{name}-sbindir.patch
 Patch2:         %{name}-ulimit_conf.patch
 ### Patch for upstream:
-## fixes typo in Makefile.am
-Patch3:         %{name}-Makefile.patch
 # Apply (open)SUSE specific changes to configuration
 Patch4:         %{name}-config.patch
 BuildRequires:  audit-libs
 BuildRequires:  courier-authlib-devel >= 0.71
 BuildRequires:  courier-unicode-devel >= 2.1
 BuildRequires:  db-devel
-BuildRequires:  gamin-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gdbm-devel
-BuildRequires:  libidn-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  ncurses-devel
 # openssl itself for /usr/bin/openssl configure check
 BuildRequires:  postfix
 BuildRequires:  procps
 BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(libidn)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(systemd)
 Requires:       courier-authlib >= 0.71
-Requires:       fam-server
 Requires:       gdbm
 Requires:       openssl
 Conflicts:      cyrus-imapd
@@ -96,6 +92,7 @@ install the entire Courier server.
 
 %prep
 %autosetup -p0
+
 # For %%doc macro
 mv libs/imap/README{,.imap}
 mv libs/maildir/README.sharedfolders{.txt,}