diff --git a/yast2-network-2.21.8.tar.bz2 b/yast2-network-2.21.8.tar.bz2
deleted file mode 100644
index 33caac8..0000000
--- a/yast2-network-2.21.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d8c26e3ce6600f3de1b365441eb8be010e7cead4b60a1a580befe1c1a9755f2
-size 297202
diff --git a/yast2-network-2.22.0.tar.bz2 b/yast2-network-2.22.0.tar.bz2
new file mode 100644
index 0000000..86540fd
--- /dev/null
+++ b/yast2-network-2.22.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2dbe3d9fd4d5af55638111826fef9f8a1b4c83508a4a82ff2bf6b511b848e79
+size 296879
diff --git a/yast2-network.changes b/yast2-network.changes
index c1961c9..29eb3aa 100644
--- a/yast2-network.changes
+++ b/yast2-network.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Jan  6 16:17:00 CET 2012 - mvidner@suse.cz
+
+- skip USB NICs during bridge proposal (bnc#710098)
+- do not inherit for new bridge port devices PREFIXLEN (bnc#735109)
+- do not inherit for bridge device ETHTOOLS_OPTIONS (bnc#735109) 
+- Filter out Chelsio devices without device file (bnc#711432) 
+- Only save LLADDR (persistent MAC) for some s390 card types
+  (bnc#658708).
+- 2.22.0
+
+-------------------------------------------------------------------
+Fri Jan  6 14:47:16 CET 2012 - mvidner@suse.cz
+
+- Moved NetworkStorage from yast2.rpm to yast2-network.rpm
+  (bnc#726057)
+- Use Storage::IsDeviceOnNetwork instead of trying to do it
+  ourselves, wrong (bnc#726057).
+
 -------------------------------------------------------------------
 Thu Sep 22 11:24:51 CEST 2011 - visnov@suse.cz
 
diff --git a/yast2-network.spec b/yast2-network.spec
index eaa90b3..a8a3fc9 100644
--- a/yast2-network.spec
+++ b/yast2-network.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-network
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           yast2-network
-Version:        2.21.8
+Version:        2.22.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-network-2.21.8.tar.bz2
-
-Prefix:         /usr
+Source0:        yast2-network-%{version}.tar.bz2
 
 Group:          System/YaST
-License:        GPL v2 or later
+License:        GPL-2.0+
 # should be required by devtools
 BuildRequires:  perl-XML-Writer pkgconfig rpm
 BuildRequires:  update-desktop-files
@@ -46,6 +43,9 @@ Requires:       sysconfig >= 0.71.2
 #GetLanguageCountry
 #(in newly created yast2-country-data)
 Requires:       yast2-country-data >= 2.16.3
+# Storage::IsDeviceOnNetwork
+BuildRequires:  yast2-storage >= 2.21.11
+Requires:       yast2-storage >= 2.21.11
 
 PreReq:         /bin/rm
 
@@ -74,37 +74,36 @@ This package contains the YaST2 component for network configuration.
 This package contains autogenerated documentation for yast2-network
 
 %prep
-%setup -n yast2-network-2.21.8
+%setup -n yast2-network-%{version}
 
 %build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
 autoreconf --force --install
 
 export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 
-%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
 # V=1: verbose build in case we used AM_SILENT_RULES(yes)
 # so that RPM_OPT_FLAGS check works
 make %{?jobs:-j%jobs} V=1
 
 %install
 make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
     d=${f##*/}
     %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
 done
 
 %ifarch s390 s390x
-/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/dsl.desktop
-/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/isdn.desktop
-/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/modem.desktop
+/bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/dsl.desktop
+/bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/isdn.desktop
+/bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/modem.desktop
 %endif
-/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/network.desktop
-/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/provider.desktop
+/bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/network.desktop
+/bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/provider.desktop
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -121,28 +120,28 @@ fi
 
 %files
 %defattr(-,root,root)
-%{prefix}/lib/YaST2/bin/*
+%{_prefix}/lib/YaST2/bin/*
 /usr/share/YaST2/data/*
 /usr/share/YaST2/include/network
 /usr/share/YaST2/clients/*.ycp
 /usr/share/YaST2/modules/YaPI/NETWORK.pm
 /usr/share/YaST2/modules/*.ycp
 /usr/share/YaST2/modules/*.ybc
-%{prefix}/share/applications/YaST2/*.desktop
+%{_prefix}/share/applications/YaST2/*.desktop
 /usr/share/YaST2/scrconf/*.scr
 /usr/lib/YaST2/servers_non_y2/ag_udev_persistent
 /usr/share/YaST2/schema/autoyast/rnc/networking.rnc
 /usr/share/YaST2/schema/autoyast/rnc/host.rnc
 /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
 
-%dir %{prefix}/share/doc/packages/yast2-network
-%{prefix}/share/doc/packages/yast2-network/COPYING
-%readme %{prefix}/share/doc/packages/yast2-network/README
+%dir %{_prefix}/share/doc/packages/yast2-network
+%{_prefix}/share/doc/packages/yast2-network/COPYING
+%readme %{_prefix}/share/doc/packages/yast2-network/README
 
 %files devel-doc
 %defattr(-,root,root)
-%doc %{prefix}/share/doc/packages/yast2-network
-%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
-%exclude %{prefix}/share/doc/packages/yast2-network/README
+%doc %{_prefix}/share/doc/packages/yast2-network
+%exclude %{_prefix}/share/doc/packages/yast2-network/COPYING
+%exclude %{_prefix}/share/doc/packages/yast2-network/README
 
 %changelog