diff --git a/yast2-firewall-3.2.0.tar.bz2 b/yast2-firewall-3.2.0.tar.bz2
deleted file mode 100644
index 6c7cba6..0000000
--- a/yast2-firewall-3.2.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:840e134b0230f350fac27686459ffd9b8bc0ff047767ac7ea1dc72dc51dedafd
-size 51782
diff --git a/yast2-firewall-4.0.0.tar.bz2 b/yast2-firewall-4.0.0.tar.bz2
new file mode 100644
index 0000000..034746a
--- /dev/null
+++ b/yast2-firewall-4.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c71f0901167de1f4dd7efa8c35cbea9f882c3c5aa4f3e9242d17dec761c35197
+size 53489
diff --git a/yast2-firewall.changes b/yast2-firewall.changes
index b9c1512..692dabd 100644
--- a/yast2-firewall.changes
+++ b/yast2-firewall.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 26 11:34:59 UTC 2017 - knut.anderssen@suse.com
+
+- Remove support for SuSEFirewall2 in firewall client supporting
+  only firewalld (fate#323460)
+- 4.0.0
+
 -------------------------------------------------------------------
 Wed Jun 14 07:37:51 UTC 2017 - mfilka@suse.com
 
diff --git a/yast2-firewall.spec b/yast2-firewall.spec
index 0256897..d56d890 100644
--- a/yast2-firewall.spec
+++ b/yast2-firewall.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firewall
-Version:        3.2.0
+Version:        4.0.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -29,9 +29,11 @@ BuildRequires:  yast2-devtools >= 3.1.10
 BuildRequires:  yast2-testsuite
 # IP::CheckNetwork
 BuildRequires:  yast2 >= 2.23.25
+BuildRequires:  rubygem(rspec)
+BuildRequires:  rubygem(yast-rake)
 
-# FirewallD backend
-Requires:       yast2 >= 3.1.191
+# FirewallD API
+Requires:       yast2 >= 4.0.12
 
 # ButtonBox widget
 Conflicts:      yast2-ycp-ui-bindings < 2.17.3
@@ -55,20 +57,25 @@ A YaST2 module to be used for configuring a firewall.
 %prep
 %setup -n %{name}-%{version}
 
+%check
+rake test:unit
+
 %build
-%yast_build
 
 %install
-%yast_install
+rake install DESTDIR="%{buildroot}"
 
 %files
 %defattr(-,root,root)
-%dir %{yast_yncludedir}/firewall
-%{yast_yncludedir}/firewall/*
-%{yast_moduledir}/SuSEFirewall*
-%{yast_clientdir}/firewall*
-%{yast_desktopdir}/firewall.desktop
+%{yast_dir}/clients/*.rb
+%{yast_dir}/lib
+%{yast_dir}/include
+%{yast_dir}/modules
+%{yast_desktopdir}/*.desktop
 %{yast_schemadir}/autoyast/rnc/firewall.rnc
-%doc %{yast_docdir}
+
+%doc COPYING
+%doc README.md
+%doc CONTRIBUTING.md
 
 %changelog