diff --git a/dovecot-fw b/dovecot-fw
deleted file mode 100644
index bc0eda9..0000000
--- a/dovecot-fw
+++ /dev/null
@@ -1,17 +0,0 @@
-## Name: Dovecot Server
-## Description: Opens ports for the Dovecot Server
-
-# space separated list of allowed TCP ports
-TCP="imap imaps pop3 pop3s sieve 4190"
-
-# 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/dovecot.changes b/dovecot.changes
index b7806ab..4706208 100644
--- a/dovecot.changes
+++ b/dovecot.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 24 08:30:42 UTC 2019 - matthias.gerstner@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+  firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
 -------------------------------------------------------------------
 Wed Jun 26 16:47:07 UTC 2019 - Matej Cepl <mcepl@suse.com>
 
diff --git a/dovecot.spec b/dovecot.spec
index ec34687..665da33 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -45,7 +45,6 @@ Source2:        dovecot-2.2.configfiles
 Source3:        %{name}.init
 Source4:        %{name}.pam
 Source5:        %{name}.README.SUSE
-Source6:        %{name}-fw
 Source7:        dovecot.tmpfiles.d
 Source8:        dovecot.service
 Source9:        dovecot.socket
@@ -93,8 +92,6 @@ install -D -m 0644 %{S:9} %{buildroot}%{_unitdir}/dovecot.socket
 
 # install pam config
 %{__install} -D -m 0644 %{S:4} %{buildroot}%{_sysconfdir}/pam.d/%{name}
-# install firewall services
-%{__install} -D -m 644 %{S:6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 # create /var directories
 %{__install} -m 0755 -Dd \
   %{buildroot}%{_var}/run/%{name}/login/ \
@@ -148,7 +145,6 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/dovecot.conf || true
 %dir /etc/dovecot/
 %ghost %config(noreplace) /etc/dovecot/*
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %{_sbindir}/rc%{name}
 %if %{with systemd}
 /usr/lib/tmpfiles.d/dovecot.conf