diff --git a/yast2-network-3.3.7.tar.bz2 b/yast2-network-3.3.7.tar.bz2
deleted file mode 100644
index 6d1ee60..0000000
--- a/yast2-network-3.3.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41b1ed72b5a88603609a0ffc6b40ac808efed6095d95c65a9a12dfc9affc8c94
-size 393051
diff --git a/yast2-network-3.3.8.tar.bz2 b/yast2-network-3.3.8.tar.bz2
new file mode 100644
index 0000000..85d4deb
--- /dev/null
+++ b/yast2-network-3.3.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ab4f658f31d55b5ea721d23c910406882a203af835c567610d84170bca71647
+size 393302
diff --git a/yast2-network.changes b/yast2-network.changes
index 0cf4ab4..a3bb19e 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,7 +1,52 @@
+-------------------------------------------------------------------
+Mon Aug 14 11:39:36 UTC 2017 - snwint@suse.com
+
+- merge storage-ng branch to master (fate#318196)
+- note: all changes below with this date belong to the merge
+- 3.3.8
+
+-------------------------------------------------------------------
+Mon Aug 14 11:39:36 UTC 2017 - ancor@suse.com
+
+- storage-ng: adapted calls to temporary y2storage_* methods, since
+  they were finally removed from Y2Storage::StorageManager.
+
+-------------------------------------------------------------------
+Mon Aug 14 11:39:36 UTC 2017 - gsouza@suse.com
+
+- Added support to storage-ng so it can verify if a disk is in
+  network.
+- Updated dependencies to include storage-ng.
+
+-------------------------------------------------------------------
+Mon Aug 14 11:39:36 UTC 2017 - shundhammer@suse.de
+
+- Merged master to storage-ng branch
+
+-------------------------------------------------------------------
+Mon Aug 14 11:39:36 UTC 2017 - ancor@suse.com
+
+- Version temporarily bumped to 3.3.x to prioritize the
+  storage-ng branch
+
+-------------------------------------------------------------------
+Mon Aug 14 11:39:36 UTC 2017 - ancor@suse.com
+
+- storage-ng: commented remaining code relying on the old
+  yast2-storage
+- Removed yast2-storage dependency
+
+-------------------------------------------------------------------
+Mon Aug 14 11:39:36 UTC 2017 - ancor@suse.com
+
+- storage-ng: commented installation-related code relying on the
+  old yast2-storage
+- Version temporarily bumped to 3.2.x to prioritize this branch
+
 -------------------------------------------------------------------
 Mon Aug 14 08:52:33 UTC 2017 - mfilka@suse.com
 
-- bnc#1047615 
+- bnc#1047615
   - check if /etc/hosts exists before loading its content
 - 3.3.7
 
diff --git a/yast2-network.spec b/yast2-network.spec
index d2364c3..02f7236 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.3.7
+Version:        3.3.8
 Release:        0
 BuildArch:      noarch
 
@@ -41,9 +41,8 @@ Requires:       yast2-xml
 
 #netconfig (FaTE #303618)
 Requires:       sysconfig >= 0.80.0
-# Storage::IsDeviceOnNetwork
-BuildRequires:  yast2-storage >= 2.21.11
-Requires:       yast2-storage >= 2.21.11
+BuildRequires:  yast2-storage-ng
+Requires:       yast2-storage-ng
 # Packages::vnc_packages
 Requires:       yast2-packager >= 3.1.47
 # cfa for parsing hosts, AugeasTree#unique_id