diff --git a/courier-imap.changes b/courier-imap.changes
index 2ad6a91..844b5eb 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 22 17:38:19 CEST 2007 - sbrabec@suse.cz
+
+- Use correct SuSEfirewall2 rule directory.
+
 -------------------------------------------------------------------
 Wed Apr 25 09:50:13 CEST 2007 - mskibbe@suse.de
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 2e15429..fd76e03 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -13,11 +13,11 @@
 Name:           courier-imap
 BuildRequires:  courier-authlib-devel fam-devel gcc-c++ gdbm-devel libstdc++-devel openssl-devel postfix procps
 Requires:       fam-server
-URL:            http://www.courier-mta.org/imap/
+Url:            http://www.courier-mta.org/imap/
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 Version:        4.1.3
-Release:        1
-License:        GNU General Public License (GPL)
+Release:        51
+License:        GPL v2 or later
 Conflicts:      imap qpopper
 Group:          Productivity/Networking/Email/Servers
 Obsoletes:      %{name}-ldap
@@ -134,9 +134,9 @@ EOF
 #make config dir
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%name/
 #firewall script
-install -d $RPM_BUILD_ROOT/etc/SuSEfirewall2.d/services/
-install -m 644 %{S:8} $RPM_BUILD_ROOT/etc/SuSEfirewall2.d/services/%{name}
-install -m 644 %{S:9} $RPM_BUILD_ROOT/etc/SuSEfirewall2.d/services/%{name}-ssl
+install -d $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/
+install -m 644 %{S:8} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name}
+install -m 644 %{S:9} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
 
 %post
 %{_datadir}/courier-imap/sysconftool `%{__cat} %{_datadir}/courier-imap/configlist` >/dev/null
@@ -180,15 +180,14 @@ exit 0
 %{_mandir}/man?/*
 %dir %{_datadir}/courier-imap/
 %{_datadir}/courier-imap/*
-%config /etc/SuSEfirewall2.d/services/%name
-%config /etc/SuSEfirewall2.d/services/%name-ssl
-%dir /etc/SuSEfirewall2.d/services
-%dir /etc/SuSEfirewall2.d
+%config /etc/sysconfig/SuSEfirewall2.d/services/%name
+%config /etc/sysconfig/SuSEfirewall2.d/services/%name-ssl
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
 %changelog
+* Mon Oct 22 2007 - sbrabec@suse.cz
+- Use correct SuSEfirewall2 rule directory.
 * Wed Apr 25 2007 - mskibbe@suse.de
 - update to version 4.1.3 which includes:
   o fix memory leak