diff --git a/yast2-installation-3.3.5.tar.bz2 b/yast2-installation-3.3.5.tar.bz2
deleted file mode 100644
index 13a8eeb..0000000
--- a/yast2-installation-3.3.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2067661fcf9a0b4ad22cc063717bbd33da3e831846fa9023563a1b362e7b21ed
-size 453351
diff --git a/yast2-installation-3.3.6.tar.bz2 b/yast2-installation-3.3.6.tar.bz2
new file mode 100644
index 0000000..bb2ce6c
--- /dev/null
+++ b/yast2-installation-3.3.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99fa1c0d55bb9d86833205d6d16c52820dfcc386f42e52faaf98b6970c5b2dde
+size 453364
diff --git a/yast2-installation.changes b/yast2-installation.changes
index 068fe8e..c98c726 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Mon Aug 14 15:13:42 CEST 2017 - shundhammer@suse.de
+
+- Merged storage-ng branch to master (fate#318196)
+- Note: all changes below with this date belong to the merge.
+- 3.3.6
+
+-------------------------------------------------------------------
+Mon Aug 14 15:13:42 CEST 2017 - ancor@suse.com
+
+- storage-ng: adapted to the new Y2Storage::StorageManager API
+  and improved probing and activation of storage devices.
+
+-------------------------------------------------------------------
+Mon Aug 14 15:13:42 CEST 2017 - aschnell@suse.com
+
+- adapted inst_disks_activate.rb to storage-ng
+
+-------------------------------------------------------------------
+Mon Aug 14 15:13:42 CEST 2017 - schubi@suse.de
+
+- storage-ng: Taking /usr/bin/findmnt in order to evaluate mount
+  points. Floppy support removed.
+
+-------------------------------------------------------------------
+Mon Aug 14 15:13:42 CEST 2017 - ancor@suse.com
+
+- storage-ng: use the new library for storage hardware probing
+  (devicegraph) instead of the old one (targetmap)
+
+-------------------------------------------------------------------
+Mon Aug 14 15:13:42 CEST 2017 - ancor@suse.com
+
+- storage-ng: removed dependency from (old) yast2-storage, even
+  if it breaks some functionality.
+
+-------------------------------------------------------------------
+Mon Aug 14 15:13:42 CEST 2017 - ancor@suse.com
+
+- storage-ng: commented installation-related code relying on the
+  old yast2-storage
+
 -------------------------------------------------------------------
 Mon Aug  7 13:43:34 UTC 2017 - jreidinger@suse.com
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index 86843c9..4bfe484 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.3.5
+Version:        3.3.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -44,6 +44,10 @@ BuildRequires:  rubygem(yast-rake)
 # CWM::RadioButtons#vspacing
 BuildRequires:  yast2 >= 3.2.20
 
+# New Y2Storage::StorageManager API
+BuildRequires:  yast2-storage-ng >= 0.1.32
+Requires:       yast2-storage-ng >= 0.1.32
+
 # AutoinstSoftware.SavePackageSelection()
 Requires:       autoyast2-installation >= 3.1.105
 
@@ -63,8 +67,10 @@ Conflicts:      yast2-mouse < 2.18.0
 # Lazy loading in ProductLicense
 Requires:       yast2-packager >= 3.1.113
 
-# Storage::GetDetectedDiskPaths
-Requires:       yast2-storage >= 2.24.1
+# FIXME: some code present in this package still depends on the old yast2-storage
+# and will break without this dependency. That's acceptable at this point of the
+# migration to storage-ng. See installer-hacks.md in the yast-storage-ng repo.
+# Requires:  yast2-storage >= 2.24.1
 
 # use in startup scripts
 Requires:       initviocons
@@ -76,8 +82,8 @@ Requires:       yast2-proxy
 # writing settings in the first installation stage.
 Requires:       yast2-services-manager >= 3.2.1
 
-## Moved inst_install_inf from yast2-network to this package
-Requires:       yast2-network >= 3.2.25
+## storage-ng based version
+Requires:       yast2-network >= 3.3.7
 
 # Augeas lenses
 Requires:       augeas-lenses
@@ -89,9 +95,9 @@ Requires:       augeas-lenses
 # new root password cwm widget
 BuildRequires:  yast2-users >= 3.2.8
 Requires:       yast2-users >= 3.2.8
-# new keyboard layout cwm widget
-BuildRequires:  yast2-country >= 3.2.7
-Requires:       yast2-country >= 3.2.7
+# storage-ng based version
+BuildRequires:  yast2-country >= 3.3.1
+Requires:       yast2-country >= 3.3.1
 
 # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile
 # pkg-bindings are not directly required
@@ -100,8 +106,8 @@ Conflicts:      yast2-pkg-bindings < 2.17.25
 # InstError
 Conflicts:      yast2 < 2.18.6
 
-# lower version requires perl-Bootloader-YAML no longer installed
-Conflicts:      yast2-bootloader < 3.1.166
+# storage-ng based version
+Conflicts:      yast2-bootloader < 3.3.1
 
 # Added new function WFM::ClientExists
 Conflicts:      yast2-core < 2.17.10