diff --git a/samba.changes b/samba.changes
index ff8b8bb..887ecbf 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Apr 11 14:55:09 UTC 2018 - aaptel@suse.com
+
+- Use new foreground execution flags for systemd samba daemons;
+  (bsc#1088574); (bsc#1071090); (bsc#1065551);
+  + Add %post scriptlet to clear old sysconfig flags
+- Update vendor-files to commit 880b3e7.
+  + Set samba sysconfig template variables to ""
+  + Add required daemon flags directly to systemd unit
+
 -------------------------------------------------------------------
 Mon Mar 26 22:37:15 UTC 2018 - jengelh@inai.de
 
diff --git a/samba.spec b/samba.spec
index 16de062..85d6b05 100644
--- a/samba.spec
+++ b/samba.spec
@@ -58,7 +58,7 @@
 %define         build_ceph 1
 %endif
 %endif
-%define		vendor_files_git_vers git.9c6e2d0
+%define		vendor_files_git_vers git.880b3e7
 
 %define talloc_version 2.1.10
 %define tevent_version 0.9.34
@@ -1367,6 +1367,19 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
 
 %post
 %if 0%{?suse_version} > 1220
+
+# bsc#1088574; bsc#1071090; bsc#1065551
+if [ -f %{_unitdir}/smb.service ] && \
+   grep -qE '^ExecStart=.*smbd.*foreground.*no-process-group' %{_unitdir}/smb.service && \
+   [ -f %{_sysconfdir}/sysconfig/samba ] && \
+   grep -q -- '-D' %{_sysconfdir}/sysconfig/samba
+then
+    echo using foreground execution for samba systemd units
+    echo overwriting samba sysconfig to remove daemon related flags...
+    sed -i 's/-D *//g' %{_sysconfdir}/sysconfig/samba
+    sed -i 's/-F *//g' %{_sysconfdir}/sysconfig/samba    
+fi
+
 %if %{with_dc}
 %service_add_post nmb.service smb.service samba-ad-dc.service
 %else
diff --git a/vendor-files-git.880b3e7.tar.bz2 b/vendor-files-git.880b3e7.tar.bz2
new file mode 100644
index 0000000..92b838a
--- /dev/null
+++ b/vendor-files-git.880b3e7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42c430e99a5f20d230ff088a3a834f11068d234a1e31ed5a5c27ae77caa023f6
+size 54269
diff --git a/vendor-files-git.9c6e2d0.tar.bz2 b/vendor-files-git.9c6e2d0.tar.bz2
deleted file mode 100644
index 4a00d19..0000000
--- a/vendor-files-git.9c6e2d0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ec33aa483190ae1494e25b8e1bb867580028166ccdefdabf04dc9b92f463b72e
-size 54217