diff --git a/patches.tar.bz2 b/patches.tar.bz2
index d194a6a..f8b9e51 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78b1326aaf76f0bd983f7a6bbafe62549515d22f3418f8f60af818d8b40e6f4c
-size 277716
+oid sha256:fab9c5eb2f35cc9e16956cb4c61c028ea7348174fea958a8d2a7fcea7740f16f
+size 279000
diff --git a/samba.changes b/samba.changes
index a45248b..d6824a9 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  7 13:59:24 UTC 2014 - lmuelle@suse.com
+
+- BuildRequire systemd-devel, configure --with-systemd, and modify the service
+  files accordingly on post-12.2 systems; (bso#10517); (bnc#865627).
+
 -------------------------------------------------------------------
 Wed Jun 25 11:52:17 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index ec6510d..150709f 100644
--- a/samba.spec
+++ b/samba.spec
@@ -119,6 +119,7 @@ BuildRequires:  libxslt-tools
 %if 0%{?suse_version} > 1220
 BuildRequires:  gpg-offline
 BuildRequires:  systemd
+BuildRequires:  systemd-devel
 %endif
 %define	samba_ver 4.1.9
 %define	samba_ver_suffix %nil
@@ -147,7 +148,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3258
+%define SOURCE_TIMESTAMP 3261
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1206,6 +1207,9 @@ CONFIGURE_OPTIONS="\
 	--with-privatedir=%{CONFIGDIR} \
 	--with-quotas \
 	--with-syslog \
+%if 0%{?suse_version} > 1220
+	--with-systemd \
+%endif
 	--with-utmp \
 	--with-winbind \
 	--with-shared-modules=%{auth_modules},%{vfs_modules},%{pdb_modules},%{idmap_modules} \
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index c7fb8ee..f4d4791 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:0382e8fcb71d00cdd2fa19f0708ad1cf6ed467f4c0a1ecab2f89d164979cfad8
-size 54607
+oid sha256:68b28e6656da39f994f07ea093ece8ec4969275d93f9b394c37aedf25e28237a
+size 54738