diff --git a/courier-imap-4.15.1.20141122.tar.bz2 b/courier-imap-4.15.1.20141122.tar.bz2
deleted file mode 100644
index 0dbf457..0000000
--- a/courier-imap-4.15.1.20141122.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31d05d48324c340d900007067ed30f3d33077530b34f5064e254c69d7d2d7f63
-size 2999907
diff --git a/courier-imap-4.15.1.20141122.tar.bz2.sig b/courier-imap-4.15.1.20141122.tar.bz2.sig
deleted file mode 100644
index d4aa6d4..0000000
Binary files a/courier-imap-4.15.1.20141122.tar.bz2.sig and /dev/null differ
diff --git a/courier-imap-4.16.2.tar.bz2 b/courier-imap-4.16.2.tar.bz2
new file mode 100644
index 0000000..8349d84
--- /dev/null
+++ b/courier-imap-4.16.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3be244b3c4d3d5c5e33efb37e4cf712ae83cbe21e43c31725e0d996ab4acc387
+size 3028445
diff --git a/courier-imap-4.16.2.tar.bz2.sig b/courier-imap-4.16.2.tar.bz2.sig
new file mode 100644
index 0000000..5bdb1ae
Binary files /dev/null and b/courier-imap-4.16.2.tar.bz2.sig differ
diff --git a/courier-imap-Makefile.patch b/courier-imap-Makefile.patch
new file mode 100644
index 0000000..5c885fb
--- /dev/null
+++ b/courier-imap-Makefile.patch
@@ -0,0 +1,26 @@
+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
+@@ -1448,7 +1448,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.changes b/courier-imap.changes
index 208fe7e..d415c4e 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Aug  5 01:45:26 UTC 2015 - chris@computersalat.de
+
+- update to 4.16.2
+  * imap/mailboxlist.c (match_mailbox_prep): Use strncmp instead of
+    memcmp, to pacify overzealous static analysis checkers.
+  * Drop SSLv3 from TLS_CIPHER_LIST.
+  * imap, pop3: Added AUTH_MKHOMEDIR_SKEL setting.
+- update to 4.16.1
+  * maildircache.c: fix use after free.
+  * mkdhparams: make compatible with libressl
+  * Handle 01-Jan-1970 for date-based searches.
+  * Update to courier-unicode 1.2.
+  * Add the makeimapaccess script.
+- add Patch courier-imap-Makefile.patch 
+
 -------------------------------------------------------------------
 Wed Oct 29 22:05:29 UTC 2014 - chris@computersalat.de
 
diff --git a/courier-imap.spec b/courier-imap.spec
index d1496cd..49f887a 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package courier-imap
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@ Name:           courier-imap
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 License:        GPL-3.0+
 Group:          Productivity/Networking/Email/Servers
-Version:        4.15.1.20141122
+Version:        4.16.2
 Release:        0
 Url:            http://www.courier-mta.org/imap/
 Source0:        %{name}-%{version}.tar.bz2
@@ -41,6 +41,9 @@ Source19:       courier-pop-ssl.service
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 910
 BuildRequires:  audit-libs
@@ -64,7 +67,7 @@ BuildRequires:  zlib-devel
 # openssl itself for /usr/bin/openssl configure check
 BuildRequires:  openssl
 Conflicts:      imap qpopper cyrus-imapd
-Requires:       courier-authlib >= 0.61
+Requires:       courier-authlib >= 0.62
 Requires:       fam-server
 Requires:       gdbm
 Requires:       openssl
@@ -107,6 +110,7 @@ install the entire Courier server.
 %setup -n %{name}-%{version}
 %patch0
 %patch2
+%patch3
 
 %build
 %configure \
@@ -247,7 +251,10 @@ done
 %config %attr(644,root,root) /etc/pam.d/imap
 %config %attr(644,root,root) /etc/pam.d/pop3
 %dir %{_sysconfdir}/courier
-%config %attr(600,root,root) %{_sysconfdir}/courier/imap*
+%dir %{_sysconfdir}/courier/imapaccess
+%dir %{_sysconfdir}/courier/shared
+%dir %{_sysconfdir}/courier/shared.tmp
+%config %attr(600,root,root) %{_sysconfdir}/courier/imapd*
 %config %attr(600,root,root) %{_sysconfdir}/courier/pop3*
 %config %{_sysconfdir}/courier/quotawarnmsg.example
 %dir %{_sysconfdir}/SuSEfirewall2.d