diff --git a/libzypp-9.8.4.tar.bz2 b/libzypp-9.8.4.tar.bz2
deleted file mode 100644
index 9d38749..0000000
--- a/libzypp-9.8.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29c652625bb729dd2c4176bf4a6c4f41a27c2521cb3717be2ed3d19516ffcf5c
-size 4695696
diff --git a/libzypp-9.8.7.tar.bz2 b/libzypp-9.8.7.tar.bz2
new file mode 100644
index 0000000..dd3e91d
--- /dev/null
+++ b/libzypp-9.8.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9192d77835ee8127685cd7caf88013a59a442cac573c55f1178d40041ce0f239
+size 4696038
diff --git a/libzypp.changes b/libzypp.changes
index ca278f3..afbcc27 100644
--- a/libzypp.changes
+++ b/libzypp.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Jul 18 11:33:25 CEST 2011 - ma@suse.de
+
+- More initialize parser structure fixes. (bnc#705181)
+- version 9.8.7 (8)
+
+-------------------------------------------------------------------
+Fri Jul 15 15:15:01 CEST 2011 - ma@suse.de
+
+- Check for /etc/sysconfig/storage changes before solving (bnc#702365)
+- version 9.8.6 (8)
+
+-------------------------------------------------------------------
+Fri Jul 15 13:58:53 CEST 2011 - ma@suse.de
+
+- Properly initialize parser structures (bnc#705181)
+- version 9.8.5 (8)
+
 -------------------------------------------------------------------
 Thu Jul  7 15:53:17 CEST 2011 - ma@suse.de
 
diff --git a/libzypp.spec b/libzypp.spec
index 11435fb..56b0746 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.8.4
-Release:        1
+Version:        9.8.7
+Release:        0
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 Provides:       yast2-packagemanager
@@ -146,7 +138,6 @@ Authors:
     Ladislav Slezak <lslezak@suse.cz>
 
 %package devel
-
 Requires:       libzypp = %{version}
 Requires:       libxml2-devel
 Requires:       openssl-devel
@@ -166,14 +157,14 @@ 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
@@ -260,6 +251,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
@@ -324,6 +316,7 @@ if is_old ${LOCKSFILE}
   done
 fi
 
+
 %postun -p /sbin/ldconfig
 
 %clean