diff --git a/courier-imap-ssl.firewall b/courier-imap-ssl.firewall
new file mode 100644
index 0000000..87d3804
--- /dev/null
+++ b/courier-imap-ssl.firewall
@@ -0,0 +1,17 @@
+## Name: courier-imapd
+## Description: Opens ports for courier-imapd.
+
+# space separated list of allowed TCP ports
+TCP="imaps pops"
+
+# space separated list of allowed UDP ports
+UDP=""
+
+# space separated list of allowed RPC services
+RPC=""
+
+# space separated list of allowed IP protocols
+IP=""
+
+# space separated list of allowed UDP broadcast ports
+BROADCAST=""
diff --git a/courier-imap.changes b/courier-imap.changes
index 5bd2bd5..b680ef1 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 23 12:39:17 CEST 2007 - mskibbe@suse.de
+
+- SuSEfirewall2 service file installed in wrong dir/broken
+  (#266949) 
+
 -------------------------------------------------------------------
 Thu Mar 29 11:30:19 CEST 2007 - rguenther@suse.de
 
diff --git a/courier-imap.firewall b/courier-imap.firewall
index 3481862..64285e5 100644
--- a/courier-imap.firewall
+++ b/courier-imap.firewall
@@ -2,10 +2,10 @@
 ## Description: Opens ports for courier-imapd.
 
 # space separated list of allowed TCP ports
-TCP="imaps imap pop pops"
+TCP="imap pop"
 
 # space separated list of allowed UDP ports
-UDP="imaps imap pop pops"
+UDP=""
 
 # space separated list of allowed RPC services
 RPC=""
diff --git a/courier-imap.spec b/courier-imap.spec
index fe073da..7921ae5 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -16,7 +16,7 @@ Requires:       fam-server
 URL:            http://www.courier-mta.org/imap/
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 Version:        4.1.2
-Release:        7
+Release:        11
 License:        GNU General Public License (GPL)
 Conflicts:      imap qpopper
 Group:          Productivity/Networking/Email/Servers
@@ -29,6 +29,7 @@ Source5:        courier-imap-ssl.init
 Source6:        courier-pop.init
 Source7:        courier-pop-ssl.init
 Source8:        %name.firewall
+Source9:        %name-ssl.firewall
 Patch:          %{name}-4.0.6.diff
 Patch1:         %{name}-4.1.1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -133,8 +134,9 @@ EOF
 #make config dir
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%name/
 #firewall script
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/
-install -m 644 %{S:8} $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/%{name}
+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
 
 %post
 %{_datadir}/courier-imap/sysconftool `%{__cat} %{_datadir}/courier-imap/configlist` >/dev/null
@@ -178,14 +180,18 @@ exit 0
 %{_mandir}/man?/*
 %dir %{_datadir}/courier-imap/
 %{_datadir}/courier-imap/*
-%{_sysconfdir}/SuSEfirewall2.d/services/%{name}
-%dir %{_sysconfdir}/SuSEfirewall2.d
-%dir %{_sysconfdir}/SuSEfirewall2.d/services
+%config /etc/SuSEfirewall2.d/services/%name
+%config /etc/SuSEfirewall2.d/services/%name-ssl
+%dir /etc/SuSEfirewall2.d/services
+%dir /etc/SuSEfirewall2.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 23 2007 - mskibbe@suse.de
+- SuSEfirewall2 service file installed in wrong dir/broken
+  (#266949)
 * Thu Mar 29 2007 - rguenther@suse.de
 - add procps BuildRequries because of interesting configure checks
 * Mon Mar 26 2007 - rguenther@suse.de