diff --git a/build-source-timestamp b/build-source-timestamp
index 8eb9995..29607e6 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2577
+2580
 Branch      : trunk
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index a93b7cb..3b174fe 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8ef6d3314c05b45747ae1b154fc765cb71f087c78ca6aec6be33861fd8a812b
-size 61004
+oid sha256:61a29677dc4007d7cca6842b7b7c7a45d825ce1cc47f7a60ce7ce35455ebe318
+size 62528
diff --git a/samba-doc.spec b/samba-doc.spec
index c1e343f..65e737d 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -415,7 +415,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 252ee4b..5cb5f00 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug  1 21:28:25 UTC 2011 - lmuelle@suse.de
+
+- Fix #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue; (bso#8303).
+
+-------------------------------------------------------------------
+Mon Aug  1 21:24:37 UTC 2011 - lmuelle@suse.de
+
+- File copy aborts with smb2_validate_message_id: bad message_id; (bso#8335).
+
 -------------------------------------------------------------------
 Sun Jul 31 14:26:37 UTC 2011 - lmuelle@suse.de
 
diff --git a/samba.spec b/samba.spec
index a25500e..de17e31 100644
--- a/samba.spec
+++ b/samba.spec
@@ -187,7 +187,7 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package client
@@ -227,7 +227,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -254,7 +254,7 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %endif
@@ -284,7 +284,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %endif
@@ -311,7 +311,7 @@ Authors:
 --------
     Jeremy Allison <jra at samba dot org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %if %{make_utils}
@@ -361,7 +361,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -387,7 +387,7 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %else
@@ -437,7 +437,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libnetapi0
@@ -456,7 +456,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libnetapi-devel
@@ -481,7 +481,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -502,7 +502,7 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %else
@@ -543,7 +543,7 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libwbclient0
@@ -562,7 +562,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libwbclient-devel
@@ -587,7 +587,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libtalloc2
@@ -608,7 +608,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libtalloc-devel
@@ -635,7 +635,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libtdb1
@@ -656,7 +656,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libtdb-devel
@@ -679,7 +679,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libtevent0
@@ -700,7 +700,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libtevent-devel
@@ -728,7 +728,7 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libldb1
@@ -751,7 +751,7 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %package -n libldb-devel
@@ -778,7 +778,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %if %{make_ldapsmb}
@@ -802,7 +802,7 @@ Authors:
 --------
     Guenther Deschner <guenther at deschner dot de>
 
-Source Timestamp: 2577
+Source Timestamp: 2580
 Branch      : trunk
 
 %endif
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 1222efa..18050e0 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66a9dc50570474470e4265c9bcc5931c0b3049db1623b5326c115b4f95903c9b
-size 51406
+oid sha256:67f99c6f77859ab53b0aa258b7a55248ebd2b5e1e60952357f2c034d4fa66e9b
+size 51348