diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 742b40e..fea9a21 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02ee243779ec50c929d0dae0db35f912cfed327fc14902f6d0b02be48cd33b76
-size 26521
+oid sha256:a4848cffaf4c5d846ab741c9663bd91d1aca9e531af7dffcd37a5d0c783e343a
+size 26515
diff --git a/samba-3.6.14.tar.bz2 b/samba-3.6.14.tar.bz2
deleted file mode 100644
index ac5428a..0000000
--- a/samba-3.6.14.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f7856df276915884b3772e0c7ed66110597a81c762648f442be671ce9dc62ee
-size 29592648
diff --git a/samba-3.6.15.tar.bz2 b/samba-3.6.15.tar.bz2
new file mode 100644
index 0000000..ca68f7c
--- /dev/null
+++ b/samba-3.6.15.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:431029eed2693827d1760efff3fd818b4994e84c3bb07b2bc30104091accdc97
+size 29595023
diff --git a/samba-doc.spec b/samba-doc.spec
index 0b728bf..c7e8df8 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -89,7 +89,7 @@ BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtevent-devel
 %endif
-%define	samba_ver 3.6.14
+%define	samba_ver 3.6.15
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -126,9 +126,9 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2982
+%define SOURCE_TIMESTAMP 2991
 %define BRANCH %{version}
-Version:        3.6.14
+Version:        3.6.15
 Release:        0
 %define	ldapsmb_ver 1.34b
 Url:            http://www.samba.org/
diff --git a/samba.changes b/samba.changes
index 06d15e6..9d9c41d 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed May  8 12:18:20 UTC 2013 - lmuelle@suse.com
+
+- Update to 3.6.15.
+  + Fix crash bug in Winbind; (bso#9854).
+
+-------------------------------------------------------------------
+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 crash bug in Winbind; (bso#9854).
+
+-------------------------------------------------------------------
+Wed May  8 10:03:35 UTC 2013 - ddiss@suse.com
+
+- Fix panic in nt_printer_publish_ads; (bso#9830).
+
 -------------------------------------------------------------------
 Mon Apr 29 12:21:15 UTC 2013 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 760c924..dd18bc3 100644
--- a/samba.spec
+++ b/samba.spec
@@ -89,7 +89,7 @@ BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtevent-devel
 %endif
-%define	samba_ver 3.6.14
+%define	samba_ver 3.6.15
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -126,9 +126,9 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2982
+%define SOURCE_TIMESTAMP 2991
 %define BRANCH %{version}
-Version:        3.6.14
+Version:        3.6.15
 Release:        0
 %define	ldapsmb_ver 1.34b
 License:        GPL-3.0+
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index c95db23..cb109e8 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:f5097097d4614e444e3ee64c245e08976524d6eee38ce9d09ee28e47ecbcf620
-size 53474
+oid sha256:1655c3d56cf71672b742c13d469251d094fbb801788d385c468b39150b67a51a
+size 53643