diff --git a/patches.tar.bz2 b/patches.tar.bz2
index fea9a21..4f5213b 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4848cffaf4c5d846ab741c9663bd91d1aca9e531af7dffcd37a5d0c783e343a
-size 26515
+oid sha256:2ae68899b672137b2e73f08cde9fd98ca966f50eb1ba98e16e0d725b8ac55d77
+size 62689
diff --git a/samba-doc.spec b/samba-doc.spec
index c7e8df8..97c5053 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2991
+%define SOURCE_TIMESTAMP 3013
 %define BRANCH %{version}
 Version:        3.6.15
 Release:        0
diff --git a/samba.changes b/samba.changes
index 9d9c41d..ea7f458 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Jun  5 11:45:41 UTC 2013 - ddiss@suse.com
+
+- Fix libreplace license ambiguity; (bso#8997); (bnc#765270).
+
+-------------------------------------------------------------------
+Tue May 28 11:59:59 UTC 2013 - lmuelle@suse.com
+
+- s3-docs: Remove "experimental" label on "max protocol=SMB2" parameter;
+  (bso#9688).
+- Remove the compound_related_in_progress state from the smb2 global state;
+  (bso#9722).
+- Makefile: Don't know how to make LIBNDR_PREG_OBJ; (bso#9868).
+
+-------------------------------------------------------------------
+Thu May 23 14:17:41 UTC 2013 - ddiss@suse.com
+
+- Fix is_printer_published GUID retrieval; (bso#9900); (bnc#798856).
+
 -------------------------------------------------------------------
 Wed May  8 12:18:20 UTC 2013 - lmuelle@suse.com
 
@@ -9,7 +28,7 @@ Wed May  8 11:26:49 UTC 2013 - lmuelle@suse.com
 
 - Add support for PFC_FLAG_OBJECT_UUID when parsing packets; (bso#9382).
 - Fix "guest ok", "force user" and "force group" for guest users; (bso#9746).
-- Fix 'map untrusted to domain' with NTLMv2; (bso#9817).
+- Fix 'map untrusted to domain' with NTLMv2; (bso#9817); (bnc#817919).
 - Fix crash bug in Winbind; (bso#9854).
 
 -------------------------------------------------------------------
@@ -54,6 +73,12 @@ Thu Apr 18 18:38:43 UTC 2013 - lmuelle@suse.com
 - Cache name_to_sid/sid_to_name correctly; (bso#9766).
 - vfs_fake_perms: Fix segfault for "artificial" conn_structs; (bso#9775).
 
+-------------------------------------------------------------------
+Mon Apr 15 13:06:58 UTC 2013 - ddiss@suse.com
+
+- Don't modify the pidfile name when a custom config file path is used;
+  (bnc#812929).
+
 -------------------------------------------------------------------
 Wed Apr  3 20:46:14 UTC 2013 - lmuelle@suse.com
 
@@ -66,7 +91,7 @@ Wed Apr  3 19:30:33 UTC 2013 - lmuelle@suse.com
 
 - Fix GNU ld version detection with old gcc releases; (bso#7825).
 - 'map untrusted to domain' treats WORKSTATION as bogus domain; (bso#9039).
-- Add extra attributes for AD printer publishing; (bso#9378).
+- Add extra attributes for AD printer publishing; (bso#9378); (bnc#798856).
 - Downgrade v4 printer driver requests to v3; (bso#9474).
 - Samba returns unexpected error on SMB posix open; (bso#9519).
 - Add support for posix_openpt; (bso#9541).
@@ -97,7 +122,7 @@ Thu Mar 14 14:40:51 UTC 2013 - ddiss@suse.com
 Tue Feb 26 13:03:46 UTC 2013 - lmuelle@suse.com
 
 - No longer use the cifs- or smbfstab named configuration file on post-12.2
-  systems; (bnc#804822).
+  systems; (bnc#804822); (bnc#821889).
 
 -------------------------------------------------------------------
 Mon Feb 25 13:08:58 UTC 2013 - lmuelle@suse.com
@@ -173,6 +198,11 @@ Wed Jan  9 21:53:11 UTC 2013 - lmuelle@suse.com
 - Add the missing get_printing_ticket binary path while calling the
   set_permissions macro; (bnc#783375).
 
+-------------------------------------------------------------------
+Thu Jan 17 12:34:31 UTC 2013 - ddiss@suse.com
+
+- Fix AD printer publishing; (bso#9378); (bnc#798856).
+
 -------------------------------------------------------------------
 Sun Dec 23 14:56:51 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index dd18bc3..96b3ccb 100644
--- a/samba.spec
+++ b/samba.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2991
+%define SOURCE_TIMESTAMP 3013
 %define BRANCH %{version}
 Version:        3.6.15
 Release:        0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index cb109e8..665c2cd 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:1655c3d56cf71672b742c13d469251d094fbb801788d385c468b39150b67a51a
-size 53643
+oid sha256:26fe7878f04333c01b689b1820edbde7e7ea645eca3f29161e99c51107f29843
+size 53601