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.8.tar.bz2 b/yast2-firewall-4.0.8.tar.bz2
new file mode 100644
index 0000000..dda30d8
--- /dev/null
+++ b/yast2-firewall-4.0.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0a847b354f6ffd1d012801b36529aaf4ceaf9907d63a551389c71877924f0d0
+size 58939
diff --git a/yast2-firewall.changes b/yast2-firewall.changes
index b9c1512..0193c7a 100644
--- a/yast2-firewall.changes
+++ b/yast2-firewall.changes
@@ -1,3 +1,68 @@
+-------------------------------------------------------------------
+Mon Jan  8 22:40:27 UTC 2018 - knut.anderssen@suse.com
+
+- AutoYaST: Added support to set the default zone and export the
+  configuration. (fate#323460)
+- 4.0.8
+
+-------------------------------------------------------------------
+Thu Jan  4 13:25:49 CET 2018 - schubi@suse.de
+
+- AutoYaST: Reading settings only if the firewalld is installed.
+  (fate#323460)
+- 4.0.7
+
+-------------------------------------------------------------------
+Fri Dec 22 08:52:21 UTC 2017 - knut.anderssen@suse.com
+
+- AutoYaST: Firewalld schema is now the default but SuSEFirewall2
+  based profiles will still work although not all the properties
+  are supported (#fate#323460)
+- 4.0.6
+
+-------------------------------------------------------------------
+Tue Nov 21 00:15:55 UTC 2017 - knut.anderssen@suse.com
+
+- Proposal: When the Firewall is disabled, open/close port links
+  are not shown in the proposal and are disabled in the specific
+  proposal dialog (bsc#1068354).
+- 4.0.5
+
+-------------------------------------------------------------------
+Wed Nov 15 14:11:40 UTC 2017 - knut.anderssen@suse.com
+
+- Do not touch firewalld services if it is not enabled in the
+  proposal (bsc#1067915)
+- Fixed a SuSEFirewallCmdLine firewalld api call.
+- 4.0.4
+
+-------------------------------------------------------------------
+Thu Nov  9 22:22:15 UTC 2017 - knut.anderssen@suse.com
+
+- ProposalSettings: fixed an attribute name error when trying to
+  block vnc port (bsc#1067320)
+- 4.0.3
+
+-------------------------------------------------------------------
+Thu Nov  9 09:16:14 UTC 2017 - knut.anderssen@suse.com
+
+- ProposalSettings: fixed method name when vnc is enable by Linuxrc
+  (bsc#1067320)
+- 4.0.2
+
+-------------------------------------------------------------------
+Wed Nov  8 13:55:31 UTC 2017 - knut.anderssen@suse.com
+
+- Added missing require (bsc#1067180)
+- 4.0.1
+
+-------------------------------------------------------------------
+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..3ec230f 100644
--- a/yast2-firewall.spec
+++ b/yast2-firewall.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-firewall
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-firewall
-Version:        3.2.0
+Version:        4.0.8
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -28,10 +28,12 @@ BuildRequires:  update-desktop-files
 BuildRequires:  yast2-devtools >= 3.1.10
 BuildRequires:  yast2-testsuite
 # IP::CheckNetwork
-BuildRequires:  yast2 >= 2.23.25
+BuildRequires:  yast2 >= 4.0.12
+BuildRequires:  rubygem(%rb_default_ruby_abi:rspec)
+BuildRequires:  rubygem(%rb_default_ruby_abi:yast-rake)
 
-# FirewallD backend
-Requires:       yast2 >= 3.1.191
+# FirewallD default zone & export support
+Requires:       yast2 >= 4.0.32
 
 # 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