diff --git a/fw-client b/fw-client
deleted file mode 100644
index c700bc9..0000000
--- a/fw-client
+++ /dev/null
@@ -1,26 +0,0 @@
-## Description: Firewall Configuration for NFS client.
-#
-# Only the variables TCP, UDP, RPC, IP and BROADCAST are allowed.
-# More may be supported in the future.
-#
-# For a more detailed description of the individual variables see
-# the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2
-#
-
-## Name: NFS Client
-## Description: Opens ports for NFS client to allow connection to an NFS server.
-
-# space separated list of allowed TCP ports
-TCP=""
-
-# space separated list of allowed UDP ports
-UDP=""
-
-# space separated list of allowed RPC services
-RPC="portmap status nlockmgr"
-
-# space separated list of allowed IP protocols
-IP=""
-
-# space separated list of allowed UDP broadcast ports
-BROADCAST=""
diff --git a/fw-server b/fw-server
deleted file mode 100644
index 5ffe976..0000000
--- a/fw-server
+++ /dev/null
@@ -1,26 +0,0 @@
-## Description: Firewall Configuration for NFS kernel server.
-#
-# Only the variables TCP, UDP, RPC, IP and BROADCAST are allowed.
-# More may be supported in the future.
-#
-# For a more detailed description of the individual variables see
-# the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2
-#
-
-## Name: NFS Server Service
-## Description: Opens ports for NFS to allow other hosts to connect.
-
-# space separated list of allowed TCP ports
-TCP=""
-
-# space separated list of allowed UDP ports
-UDP=""
-
-# space separated list of allowed RPC services
-RPC="portmap status nlockmgr mountd nfs nfs_acl"
-
-# space separated list of allowed IP protocols
-IP=""
-
-# space separated list of allowed UDP broadcast ports
-BROADCAST=""
diff --git a/nfs-utils.changes b/nfs-utils.changes
index 7287328..532275b 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 24 13:07:41 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 Jan 30 00:10:03 UTC 2019 - Neil Brown <nfbrown@suse.com>
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index abeb1ec..e12c570 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.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/
 #
 
 
@@ -34,8 +34,6 @@ Source0:        http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils
 Source1:        nfs.doc.tar.bz2
 Source4:        sysconfig.nfs
 Source6:        README.NFSv4
-Source7:        fw-client
-Source8:        fw-server
 Source11:       idmapd.conf
 Source13:       nfs-utils.rpmlintrc
 Source20:       nfs-mountd.options.conf
@@ -206,8 +204,6 @@ mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/sm
 mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/sm.bak
 touch %{buildroot}%{_localstatedir}/lib/nfs/state
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
-install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-client
-install -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
 install -m 644 utils/mount/nfsmount.conf %{buildroot}%{_sysconfdir}/nfsmount.conf
 #
 # hack to avoid automatic python dependency
@@ -350,7 +346,6 @@ fi
 %attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm
 %attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm.bak
 %attr(0700,statd,nogroup) %ghost %{_localstatedir}/lib/nfs/state
-%config %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-client
 
 %files -n nfs-kernel-server
 %defattr(-,root,root)
@@ -375,7 +370,6 @@ fi
 %{_mandir}/man8/nfsdcltrack.8%{ext_man}
 %config(noreplace) %{_localstatedir}/lib/nfs/etab
 %config(noreplace) %{_localstatedir}/lib/nfs/rmtab
-%config %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
 
 %files -n libnfsidmap1
 %{_libdir}/libnfsidmap-1.0.0/