diff --git a/libzypp-10.1.1.tar.bz2 b/libzypp-10.1.1.tar.bz2
new file mode 100644
index 0000000..98df225
--- /dev/null
+++ b/libzypp-10.1.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbfb4dc53f31f1b2b23518627f2980a577613932c24ad3955309fefce17b119f
+size 5002658
diff --git a/libzypp-9.11.0.tar.bz2 b/libzypp-9.11.0.tar.bz2
deleted file mode 100644
index 13df580..0000000
--- a/libzypp-9.11.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c4e4b10dc45adf6da9ab67ffd5c5dbf087625742753e25c6b4dd3c5d71ee1a6
-size 4999930
diff --git a/libzypp.changes b/libzypp.changes
index d34724f..afea7af 100644
--- a/libzypp.changes
+++ b/libzypp.changes
@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Thu Oct 13 11:50:26 CEST 2011 - ma@suse.de
+
+- Must not differ between type nfs and nfs4 when checking the mount 
+  table (bnc#710269)
+- version 10.1.1 (1)
+
+-------------------------------------------------------------------
+Thu Oct 13 01:13:37 CEST 2011 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue Oct 11 15:20:43 CEST 2011 - ma@suse.de
+
+- Switch to using libsolv instead of satsolver
+- version 10.1.0 (1)
+
+-------------------------------------------------------------------
+Sun Oct  9 01:13:16 CEST 2011 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Oct  6 01:14:00 CEST 2011 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue Sep 20 09:57:04 CEST 2011 - ma@suse.de
+
+- Bump major version for Factory; 9.x is continued on SLE-11-SP2-Branch
+- version 10.0.0 (0)
+
 -------------------------------------------------------------------
 Tue Sep 13 10:51:53 CEST 2011 - ma@suse.de
 
diff --git a/libzypp.spec b/libzypp.spec
index 9dd53c4..3285026 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -1,30 +1,22 @@
 #
 # spec file for package libzypp
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
 #
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
-
 Name:           libzypp
 License:        GPLv2
 Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Package, Patch, Pattern, and Product Management
-Version:        9.11.0
-Release:        1
+Version:        10.1.1
+Release:        0
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 Provides:       yast2-packagemanager
@@ -52,17 +44,17 @@ BuildRequires:  hal-devel
 BuildRequires:  boost-devel
 BuildRequires:  dejagnu
 BuildRequires:  doxygen
-BuildRequires:  gcc-c++
+BuildRequires:  gcc-c++ >= 4.5
 BuildRequires:  gettext-devel
 BuildRequires:  graphviz
 BuildRequires:  libxml2-devel
 BuildRequires:  libproxy-devel
 
-BuildRequires:  libsatsolver-devel >= 0.14.17
+BuildRequires:  libsolv-devel
 %if 0%{?suse_version} >= 1100
-%requires_eq    satsolver-tools
+%requires_eq    libsolv-tools
 %else
-Requires:       satsolver-tools
+Requires:       libsolv-tools
 %endif
 
 # required for testsuite, webrick
@@ -74,7 +66,7 @@ BuildRequires:  libexpat-devel
 BuildRequires:  expat-devel
 %endif
 
-Requires:       rpm
+Requires:	rpm
 
 %if 0%{?suse_version}
 BuildRequires:  rpm-devel
@@ -103,7 +95,6 @@ Requires:       gpg2
 Requires:       gnupg2
 %endif
 
-%define min_aria_version 1.1.2
 # ---------------------------------------------------------------
 %if 0%{?suse_version} >= 1110
 # (almost) common codebase, but on SLES11-SP1 (according to Rudi
@@ -148,7 +139,6 @@ Authors:
     Ladislav Slezak <lslezak@suse.cz>
 
 %package devel
-
 Requires:       libzypp = %{version}
 Requires:       libxml2-devel
 Requires:       openssl-devel
@@ -168,19 +158,19 @@ Requires:       cmake
 %if 0%{?suse_version}
 %if 0%{?suse_version} >= 1100
 # Code11+
-Requires:       libcurl-devel >= %{min_curl_version}
+Requires:  libcurl-devel >= %{min_curl_version}
 %else
 # Code10
-Requires:       curl-devel
+Requires:  curl-devel
 %endif
 %else
 # Other distros (Fedora)
-Requires:       libcurl-devel >= %{min_curl_version}
+Requires:  libcurl-devel >= %{min_curl_version}
 %endif
 %if 0%{?suse_version} >= 1100
-%requires_ge    libsatsolver-devel
+%requires_ge    libsolv-devel
 %else
-Requires:       libsatsolver-devel
+Requires:       libsolv-devel
 %endif
 Summary:        Package, Patch, Pattern, and Product Management - developers files
 Group:          System/Packages
@@ -262,6 +252,7 @@ make -C po install DESTDIR=$RPM_BUILD_ROOT
 cd ..
 %{find_lang} zypp
 
+
 %post
 /sbin/ldconfig
 if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi
@@ -326,6 +317,7 @@ if is_old ${LOCKSFILE}
   done
 fi
 
+
 %postun -p /sbin/ldconfig
 
 %clean