diff --git a/courier-imap.changes b/courier-imap.changes
index 90a1fcc..ca88963 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri May 20 10:34:20 CEST 2016 - kukuk@suse.de
+
+- Remove directories already part of filesystem rpm
+
+-------------------------------------------------------------------
+Tue May 17 13:24:37 CEST 2016 - kukuk@suse.de
+
+- Fix path of SuSEfirewall2.d directory
+
 -------------------------------------------------------------------
 Mon May 16 12:59:14 UTC 2016 - chris@computersalat.de
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 9377c56..46dcff6 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package courier-imap
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -187,8 +187,8 @@ done
 %{_sysconfdir}/courier/pop3d-ssl.dist
 EOF
 #firewall script
-%{__install} -D -m 644 %{S:4} %{buildroot}%{_sysconfdir}/SuSEfirewall2.d/services/%{name}
-%{__install} -D -m 644 %{S:5} %{buildroot}%{_sysconfdir}/SuSEfirewall2.d/services/%{name}-ssl
+%{__install} -D -m 644 %{S:4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+%{__install} -D -m 644 %{S:5} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
 
 %pre
 %if 0%{?has_systemd}
@@ -257,10 +257,8 @@ done
 %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
-%dir %{_sysconfdir}/SuSEfirewall2.d/services
-%config %{_sysconfdir}/SuSEfirewall2.d/services/%{name}
-%config %{_sysconfdir}/SuSEfirewall2.d/services/%{name}-ssl
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
 %dir %{_prefix}/lib/%{name}
 %{_prefix}/lib/%{name}/makedatprog
 %{_prefix}/lib/%{name}/couriertcpd