diff --git a/autoyast2-4.0.5.tar.bz2 b/autoyast2-4.0.5.tar.bz2
deleted file mode 100644
index adfd912..0000000
--- a/autoyast2-4.0.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aca0120a2d946351536c6f91ddf4548ca67f46ef6e79176eaa3362cd55a50e94
-size 662445
diff --git a/autoyast2-4.0.7.tar.bz2 b/autoyast2-4.0.7.tar.bz2
new file mode 100644
index 0000000..a45f4d1
--- /dev/null
+++ b/autoyast2-4.0.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b286c4beca73c4228c7ac16cf5c3e7fa3206b0fc93c7f1fa1745fad45586124
+size 658879
diff --git a/autoyast2.changes b/autoyast2.changes
index 7c3b4ed..5a5165f 100644
--- a/autoyast2.changes
+++ b/autoyast2.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Nov 14 13:38:44 CET 2017 - schubi@suse.de
+
+- Code cleanup (removing old libstorage code).
+- Adapting rules to storage-ng.
+- partition_alignment removed because it is not needed
+  anymore by storage-ng.
+- 4.0.7
+
+-------------------------------------------------------------------
+Tue Nov  7 15:01:35 UTC 2017 - igonzalezsosa@suse.com
+
+- Add storage data to ayast_probe client (bsc#1065668)
+- Handle storage proposal exceptions in a proper way
+- 4.0.6
+
 -------------------------------------------------------------------
 Tue Oct 31 14:13:40 UTC 2017 - igonzalezsosa@suse.com
 
diff --git a/autoyast2.spec b/autoyast2.spec
index 184ec2e..bc7cc03 100644
--- a/autoyast2.spec
+++ b/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        4.0.5
+Version:        4.0.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -35,14 +35,17 @@ BuildRequires:  libxslt
 BuildRequires:  yast2
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:rspec)
 # FileSystems.read_default_subvol_from_target
+BuildRequires:  libstorage-ng1
+BuildRequires:  yast2-country
 BuildRequires:  yast2-packager
 BuildRequires:  yast2-services-manager
 BuildRequires:  yast2-slp
+BuildRequires:  yast2-storage-ng
 BuildRequires:  yast2-transfer
 BuildRequires:  yast2-update >= 3.3.0
 BuildRequires:  yast2-xml
-# Y2Storage::AutoinstIssues containing section information
-BuildRequires:  yast2-storage-ng >= 4.0.15
+# Y2Storage::AutoinstProfile::SkipListValue#to_hash
+BuildRequires:  yast2-storage-ng >= 4.0.23
 
 # %%{_unitdir} macro definition is in a separate package since 13.1
 %if 0%{?suse_version} >= 1310
@@ -61,8 +64,8 @@ Requires:       yast2-network >= 3.1.145
 Requires:       yast2-schema
 Requires:       yast2-transfer >= 2.21.0
 Requires:       yast2-xml
-# Y2Storage::AutoinstIssues containing section information
-Requires:       yast2-storage-ng >= 4.0.15
+# Y2Storage::AutoinstProfile::SkipListValue#to_hash
+Requires:       yast2-storage-ng >= 4.0.23
 Conflicts:      yast2-installation < 3.1.166
 
 Provides:       yast2-config-autoinst
@@ -291,6 +294,9 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
 %dir %{yast_libdir}/autoinstall/dialogs
 %{yast_libdir}/autoinstall/dialogs/*.rb
 
+%dir %{yast_libdir}/autoinstall/clients
+%{yast_libdir}/autoinstall/clients/*.rb
+
 # scripts
 %{_prefix}/lib/YaST2/bin/fetch_image.sh
 %{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh