diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 639078a..09dbe52 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b35e702bd67105ebae7318ba3511fb4dec95a52d5c6c4c0191d2a871d618398a
-size 282754
+oid sha256:f27e67370176bd606594deb7b76d52e89e5016695bd29d764713eab731ec53ec
+size 318761
diff --git a/samba.changes b/samba.changes
index bd93577..e793335 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  8 10:13:03 CEST 2014 - nopower@suse.de
+
+- Backport upstream master fixes for samba-regedit; (bnc#896536).
+
 -------------------------------------------------------------------
 Fri Sep 26 15:41:38 CEST 2014 - nopower@suse.de
 
diff --git a/samba.spec b/samba.spec
index a965c3e..8e0b4d0 100644
--- a/samba.spec
+++ b/samba.spec
@@ -146,7 +146,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3293
+%define SOURCE_TIMESTAMP 3305
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index c6ede5c..29489bd 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:7d7ed3553a48fc35ba619f5542a02098b999f8bddd292d6d92d8bacbbb1c1fea
-size 54770
+oid sha256:267576ebe80222aac281aa1eba839739114de1c85f048cfffb8c2180b5e2413c
+size 54270