diff --git a/ocserv.SuSEfirewall b/ocserv.SuSEfirewall
deleted file mode 100644
index 4212553..0000000
--- a/ocserv.SuSEfirewall
+++ /dev/null
@@ -1,6 +0,0 @@
-## Name: ocserv
-## Description: opens ports for ocserv
-# space separated list of allowed TCP ports
-TCP="9000"
-# space separated list of allowed UDP ports
-UDP="9001"
diff --git a/ocserv.changes b/ocserv.changes
index 02e3646..d8bb058 100644
--- a/ocserv.changes
+++ b/ocserv.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 24 13:28:00 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
+
 -------------------------------------------------------------------
 Tue Apr 23 09:08:03 UTC 2019 - Michael Du <duyizhaozj321@yahoo.com>
 
diff --git a/ocserv.spec b/ocserv.spec
index 3906646..12320cf 100644
--- a/ocserv.spec
+++ b/ocserv.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/
 #
 
 
@@ -31,7 +31,6 @@ Source:         %{name}-%{version}.tar.xz
 Source1:        ca.tmpl
 Source2:        server.tmpl
 Source3:        user.tmpl
-Source4:        ocserv.SuSEfirewall
 Source5:        ocserv.sysctl
 Source6:        ocserv.firewalld.xml
 Source99:       README.SUSE
@@ -107,7 +106,6 @@ make V=1 %{?_smp_mflags}
 %install
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
 
-install -Dm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ocserv
 install -Dm 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysctl.d/60-ocserv.conf
 %if 0%{suse_version} >= 1500
 install -D -m 644 %{SOURCE6} %{buildroot}%{_libexecdir}/firewalld/services/ocserv.xml
@@ -147,7 +145,6 @@ install -m 0644 doc/systemd/socket-activated/ocserv.service %{buildroot}%{_unitd
 %doc AUTHORS NEWS README.md TODO
 %license COPYING LICENSE
 %config %{_sysconfdir}/ocserv
-%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ocserv
 %config(noreplace) %{_sysconfdir}/sysctl.d/60-ocserv.conf
 %if 0%{suse_version} >= 1500
 %dir %{_libexecdir}/firewalld