diff --git a/drbd-8.2.6.tar.bz2 b/drbd-8.2.6.tar.bz2
index edeea00..8fa6652 100644
--- a/drbd-8.2.6.tar.bz2
+++ b/drbd-8.2.6.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4179667c33653c273060636deadf872ef1ea65ccccb1019973752cbae730c7d9
-size 265158
+oid sha256:ed9ca6310532bc208e02f9f6787fc0f40fdb177d923d6c283c96140d39b890f6
+size 278298
diff --git a/drbd.changes b/drbd.changes
index 9066fbf..5773d76 100644
--- a/drbd.changes
+++ b/drbd.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Sep  4 12:13:27 CEST 2008 - lmb@suse.de
+
+- Imported some changes from upstream, including:
+- Made it to compile on Linux-2.6.26
+- Fixed online resizing if there is application IO on the fly when the
+  resize is triggered.
+- Fixed online resizing if it is triggered from the secondary node.
+- Fixed a possible deadlock in case "become-primary-on-both" is used, and
+  a resync starts
+- Fixed the invocation of the pri-on-incon-degr handler
+- Fixed the exit codes of drbdsetup
+- sock_create_lite() to avoid a socket->sk leak
+- Auto-tune socket buffers if sndbuf-size is set to zero
+
 -------------------------------------------------------------------
 Mon Aug 18 18:07:48 CEST 2008 - mrueckert@suse.de
 
diff --git a/drbd.spec b/drbd.spec
index 3bdfd2e..36c3608 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -24,7 +24,7 @@ BuildRequires:  xen-tools
 %endif
 Summary:        Distributed Replicated Block Device
 Version:        8.2.6
-Release:        3
+Release:        4
 Source:         %{name}-%{version}.tar.bz2
 Patch0:         drbd-optflags.patch
 License:        GPL v2 or later
@@ -159,6 +159,18 @@ rm -rf "$RPM_BUILD_ROOT"
 %doc scripts/drbd.conf
 
 %changelog
+* Thu Sep 04 2008 lmb@suse.de
+- Imported some changes from upstream, including:
+- Made it to compile on Linux-2.6.26
+- Fixed online resizing if there is application IO on the fly when the
+  resize is triggered.
+- Fixed online resizing if it is triggered from the secondary node.
+- Fixed a possible deadlock in case "become-primary-on-both" is used, and
+  a resync starts
+- Fixed the invocation of the pri-on-incon-degr handler
+- Fixed the exit codes of drbdsetup
+- sock_create_lite() to avoid a socket->sk leak
+- Auto-tune socket buffers if sndbuf-size is set to zero
 * Mon Aug 18 2008 mrueckert@suse.de
 - remove outdated options in the fillup_and_insserv call
 * Mon Aug 18 2008 schwab@suse.de