diff --git a/libzypp-3.18.4.tar.bz2 b/libzypp-3.18.4.tar.bz2
index bd569b9..65fabe1 100644
--- a/libzypp-3.18.4.tar.bz2
+++ b/libzypp-3.18.4.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfb5ed42094bade4a8bb2e3b9cd0abd10d4ac695d00ff2b2534e6232daf48756
-size 2909608
+oid sha256:3feb13775167a8ae6167d70cd861140016ad81f2eb512f9c4ecf0b2ae6676460
+size 2908155
diff --git a/libzypp.changes b/libzypp.changes
index ca11539..5063fba 100644
--- a/libzypp.changes
+++ b/libzypp.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Aug 27 17:08:41 CEST 2007 - kkaempf@suse.de
+
+- Add ZConfig::overrideSystemArchitecture() to override zypp arch
+  from external, e.g. for the testcases
+- Honor ZYPP_CONF environment variable to override the buit-in
+  /etc/zypp/zypp.conf
+- Check architecture at handout() to prevent NULL ptr reference.
+- Bug 301286
+- rev 6908
+
+-------------------------------------------------------------------
+Mon Aug 27 15:53:52 CEST 2007 - schubi@suse.de
+
+-The solver generate an establish call for all
+ resolvables which has filesystemcaps if there is not a valid result from a
+ former solver run available. This covers:
+ * Initial solver run
+ * Changing of filesystem whithin a workflow, cause the solver results will
+   be reset if the filesystem dependencies have been changed
+ Bug 271912
+- r 6901 
+
 -------------------------------------------------------------------
 Sun Aug 26 15:49:27 CEST 2007 - kkaempf@suse.de
 
diff --git a/libzypp.spec b/libzypp.spec
index 8195a8b..b340cbf 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -17,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:    on
 Summary:        Package, Patch, Pattern, and Product Management
 Version:        3.18.4
-Release:        4
+Release:        5
 Source:         libzypp-3.18.4.tar.bz2
 Source1:        libzypp-rpmlintrc
 Prefix:         /usr
@@ -125,6 +125,23 @@ cd ..
 %{_libdir}/pkgconfig/libzypp.pc
 
 %changelog
+* Mon Aug 27 2007 - kkaempf@suse.de
+- Add ZConfig::overrideSystemArchitecture() to override zypp arch
+  from external, e.g. for the testcases
+- Honor ZYPP_CONF environment variable to override the buit-in
+  /etc/zypp/zypp.conf
+- Check architecture at handout() to prevent NULL ptr reference.
+- Bug 301286
+- rev 6908
+* Mon Aug 27 2007 - schubi@suse.de
+-The solver generate an establish call for all
+  resolvables which has filesystemcaps if there is not a valid result from a
+  former solver run available. This covers:
+  * Initial solver run
+  * Changing of filesystem whithin a workflow, cause the solver results will
+  be reset if the filesystem dependencies have been changed
+  Bug 271912
+- r 6901
 * Sun Aug 26 2007 - kkaempf@suse.de
 - pass location to plaindir package (#303751)
 - Add name of file in question to checksum/signature related