diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 2683bb2..490feb6 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45dba275acb7a67f755c324c4dd2e5aa235862473c62581200c0c866b3b60d8a
-size 33147
+oid sha256:9a45e4cd30ef4f247a384f161dc95a017508ccfb34591e20fd46b220b8114033
+size 48157
diff --git a/samba-doc.spec b/samba-doc.spec
index 74486be..73b6dd4 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 2956
+%define SOURCE_TIMESTAMP 2964
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
diff --git a/samba.changes b/samba.changes
index 09b5594..3c57919 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+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).
+- 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).
+- Add dbwrap_tool.1 manual page; (bso#9568).
+- Unlink after open causes smbd to panic; (bso#9571).
+- Fix a possible null pointer dereference in spoolss; (bso#9574).
+- Samba 3.6.x not correctly signing any but the last response in a compound
+  request/response; (bso#9585).
+- "smbd[pid]: disk_free: sys_popen() failed" message logged in
+  /var/log/messages many times; (bso#9586).
+- Archive flag is always set on directories; (bso#9587).
+- ACLs are not inherited to directories for DFS shares; (bso#9588).
+- wbcAuthenticateEx gives unix times; (bso#9625).
+- Renaming directories as guest user in security share mode doesn't work;
+  (bso#9637).
+- Make SMB2_GETINFO multi-volume aware; (bso#9646).
+- Fix initial large PAC sess setup response; (bso#9658).
+- Fix two resource leaks in winbindd; (bso#9684).
+- Fix a possible buffer overrun in pdb_smbpasswd; (bso#9686).
+- Fix vfs_catia module; (bso#9701).
+
 -------------------------------------------------------------------
 Tue Feb 26 13:03:46 UTC 2013 - lmuelle@suse.com
 
@@ -138,7 +165,7 @@ Fri Nov 30 18:14:37 UTC 2012 - lmuelle@suse.com
 -------------------------------------------------------------------
 Wed Nov 28 13:08:20 UTC 2012 - jmcdonough@suse.com
 
-- Fix fd leak causing 100% CPU in winbind on certain dc connection 
+- Fix fd leak causing 100% CPU in winbind on certain dc connection
   failures; (bso#9436); (bnc#786677).
 
 -------------------------------------------------------------------
@@ -565,7 +592,7 @@ Mon Feb  6 13:36:38 UTC 2012 - lmuelle@suse.de
 Mon Feb  6 13:34:09 UTC 2012 - lmuelle@suse.de
 
 - s3:smbd:smb2: fix an assignment-instead-of-check bug conn_snum_used();
-  (bso#8738).
+  (bso#8738); CVE-2013-0454; (bnc#811975).
 
 -------------------------------------------------------------------
 Mon Feb  6 13:30:53 UTC 2012 - lmuelle@suse.de
@@ -800,7 +827,7 @@ Mon Jan 16 16:41:18 UTC 2012 - lmuelle@suse.de
   (#bso8560).
 - Disconnecting clients swamp the logs; (bso#8585).
 - s3-netlogon: Fix setting the machinge account password; (bso#8550).
-- winbind_samlogon_retry_loop ignores logon_parameters flags; (#bso8548). 
+- winbind_samlogon_retry_loop ignores logon_parameters flags; (#bso8548).
 - smbclient posix_open command fails to return correct info on open file;
   (bso#8542).
 - readlink() on Linux clients fails if the symlink target is outside of the
@@ -2004,7 +2031,7 @@ Sat Nov 20 08:31:14 UTC 2010 - lmuelle@suse.de
 -------------------------------------------------------------------
 Fri Nov 19 19:18:17 CEST 2010 - jmcdonough@suse.de
 
-- Reduce unnecessary ldap round trips and eliminate invalid DN 
+- Reduce unnecessary ldap round trips and eliminate invalid DN
   messages; (bnc#654719).
 
 -------------------------------------------------------------------
@@ -2182,7 +2209,7 @@ Thu Aug 12 22:06:35 UTC 2010 - jmcdonough@suse.de
 Wed Jul 28 15:08:09 CEST 2010 - sjayaraman@suse.de
 
 - cifs: do not restart during dhcp lease renewal when IPaddress remains
-  the same; (bnc#573246). 
+  the same; (bnc#573246).
 
 -------------------------------------------------------------------
 Mon Jul  5 19:31:55 UTC 2010 - lmuelle@suse.de
diff --git a/samba.spec b/samba.spec
index b211d57..d2bc099 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 2956
+%define SOURCE_TIMESTAMP 2964
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index ed43623..a8b5407 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:ce5dd2194b4d9421cabf9615b817d1f9b922352d686f231be9c3f7b7a8a5fe27
-size 53283
+oid sha256:285ff28161552db95bc8a710b2a2be73d64f8ff58da4919d54bd51a88ce6bd86
+size 53830