diff --git a/mosquitto.changes b/mosquitto.changes
index a763c8a..404d547 100644
--- a/mosquitto.changes
+++ b/mosquitto.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 11 05:41:41 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Remove SuSEfirewall2 service since SuSEfirewall2 has been
+  replaced by firewalld (which already provides a mqtt service).
+
 -------------------------------------------------------------------
 Thu Apr 18 08:47:30 UTC 2019 - Martin Hauke <mardnh@gmx.de>
 
diff --git a/mosquitto.fw b/mosquitto.fw
deleted file mode 100644
index 111c7d8..0000000
--- a/mosquitto.fw
+++ /dev/null
@@ -1,5 +0,0 @@
-## Name: Mosquitto MQTT Broker
-## Description: Open ports for Mosquitto MQTT Broker
-
-# space separated list of allowed TCP ports
-TCP="1883"
diff --git a/mosquitto.spec b/mosquitto.spec
index 5666dd7..fbba0b3 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -16,7 +16,6 @@
 #
 
 
-%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 %define home    %{_localstatedir}/lib/%{name}
 %define c_lib   libmosquitto1
 %define cpp_lib libmosquittopp1
@@ -37,7 +36,6 @@ Source:         https://mosquitto.org/files/source/mosquitto-%{version}.tar.gz
 Source98:       https://mosquitto.org/files/source/mosquitto-%{version}.tar.gz.asc#/%{name}-%{version}.tar.gz.sig
 Source99:       %{name}.keyring
 Source1:        mosquitto.service
-Source2:        mosquitto.fw
 Source4:        README-conf-d
 Source5:        README-ca_certificates
 Source6:        README-certs
@@ -143,7 +141,6 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 install -Dd -m 0750 %{buildroot}%{home}
 chmod -R o= %{buildroot}%{_sysconfdir}/%{name}/
 %if 0%{?suse_version}
-install -D -m 644 %{SOURCE2}                      %{buildroot}%{_fwdefdir}/mosquitto
 install -D -m 644 security/mosquitto.apparmor %{buildroot}%{_sysconfdir}/apparmor.d/usr.sbin.mosquitto
 install -D -m 755 -d                          %{buildroot}%{_sysconfdir}/apparmor.d/local/
 echo "# Site-specific additions and overrides for 'usr.sbin.mosquitto'" > %{buildroot}%{_sysconfdir}/apparmor.d/local/usr.sbin.mosquitto
@@ -216,7 +213,6 @@ getent passwd %{name} || %{_sbindir}/useradd -g %{name} -s /bin/false -r -c "%{n
 %dir %{_sysconfdir}/apparmor.d/local/
 %config %{_sysconfdir}/apparmor.d/usr.sbin.mosquitto
 %config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.sbin.mosquitto
-%config(noreplace) %{_fwdefdir}/mosquitto
 %endif
 
 %files clients