diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz
index 04c9ac5d..c5917f5e 100644
--- a/systemd-232.tar.xz
+++ b/systemd-232.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc6ee1dab9013b879e3ae500b79875651c4462e23a9b9fbeab06597828ee00a3
-size 3211676
+oid sha256:ce282eea299d1e50f206a96e8f860f45c44e0a08c6ab8356582775f924d2d795
+size 3211444
diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc
index 5b7980e5..a2cefb37 100644
--- a/systemd-mini-rpmlintrc
+++ b/systemd-mini-rpmlintrc
@@ -19,6 +19,7 @@ addFilter("libudev-mini.*shlib-policy-name-error.*")
 addFilter("nss-systemd.*shlib-policy-name-error.*")
 addFilter("nss-myhostname.*shlib-policy-name-error.*")
 addFilter("nss-mymachines.*shlib-policy-name-error.*")
+addFilter("nss-resolve.*shlib-policy-name-error.*")
 addFilter("systemd-logger.*useless-provides sysvinit(syslog).*")
 addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*")
 addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*")
diff --git a/systemd-mini.changes b/systemd-mini.changes
index b7ed294e..f0f16403 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com
+
+- Don't ship systemd-resolved for now (bsc#1024897)
+
+  If resolved is enabled , systemd-tmpfiles creates a wrong symlink in
+  /etc/resolv.conf which confuses the network manager actually used.
+
+-------------------------------------------------------------------
+Thu Feb  9 14:06:46 UTC 2017 - fbui@suse.com
+
+- More indentation cleanup (no functional changes)
+
+-------------------------------------------------------------------
+Wed Feb  8 08:45:09 CET 2017 - kukuk@suse.de
+
+- Remove obsolete insserv requirements for udev again [bsc#999841]
+
+-------------------------------------------------------------------
+Mon Feb  6 14:13:00 UTC 2017 - fbui@suse.com
+
+- Import commit cd97d5d5fef79ab9d957bf6504d085c0faca6bfc
+
+  e587b6ce0 disable RestrictAddressFamilies on all architectures but x86_64 one (bsc#1023460)
+  c8ae05632 journald: don't flush to /var/log/journal before we get asked to (bsc#1004094)
+  7261eaf3e sd-event: fix sd_event_source_get_priority() (#4712)
+
+-------------------------------------------------------------------
+Fri Feb  3 08:37:22 UTC 2017 - fbui@suse.com
+
+- Move fix for permission set on /var/lib/systemd/linger/* (no functional changes)
+
+  Move that part after the fix on timer timestamp files otherwise the
+  comment doesn't make sense.
+
+-------------------------------------------------------------------
+Wed Feb  1 15:06:06 UTC 2017 - fbui@suse.com
+
+- Import commit 028fd9b60580976dffb09b3576a2b652ee35137c
+
+  cc2ca55ff build-sys: do not install ctrl-alt-del.target symlink twice
+  ececae77a device: Avoid calling unit_free(NULL) in device setup logic (#4748)
+
+-------------------------------------------------------------------
+Wed Feb  1 14:32:28 UTC 2017 - fbui@suse.com
+
+- Ship systemd-resolved but it's disabled by default (bsc#1018387)
+
+  The NSS plugin will also be disabled, users need to enable it
+  manually.
+
 -------------------------------------------------------------------
 Wed Jan 25 15:37:23 UTC 2017 - fbui@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index a0b92de5..395e85ee 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -230,7 +230,6 @@ Requires(pre):  /usr/sbin/groupadd
 Requires(pre):  /usr/bin/getent
 Requires(post): sed
 Requires(post): /usr/bin/systemctl
-Requires(postun): %insserv_prereq
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -399,9 +398,6 @@ Some systemd commands offer bash completion, but it is an optional dependency.
 
 %prep
 %setup -q -n systemd-%{version}
-echo "Checking whether upstream rpm macros changed..."
-#skipped for now
-#[ -z "`diff -Naru "%{S:10}" src/core/macros.systemd.in`" ] || exit 1
 
 # only needed for bootstrap
 %if 0%{?bootstrap}
@@ -543,9 +539,9 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.*
 
 # legacy links
 for f in loginctl journalctl ; do
-  ln -s $f %{buildroot}%{_bindir}/systemd-$f
+        ln -s $f %{buildroot}%{_bindir}/systemd-$f
 %if ! 0%{?bootstrap}
-  ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
+        ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
 %endif
 done
 ln -s /usr/lib/udev %{buildroot}/lib/udev
@@ -687,7 +683,7 @@ fi >/dev/null
 # since v207 /etc/sysctl.conf is no longer parsed, however
 # backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf
 if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then
-    ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
+        ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
 fi
 
 # migrate any symlink which may refer to the old path
@@ -706,11 +702,6 @@ enabled)  ;;
 *)        rm -f %{_prefix}/lib/systemd/system/tmp.mount
 esac
 
-# Same for user lingering created by logind.
-for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do
-        chmod 0644 $username
-done
-
 # v228 wrongly set world writable suid root permissions on timestamp
 # files used by permanent timers. Fix the timestamps that might have
 # been created by the affected versions of systemd (bsc#1020601).
@@ -718,6 +709,11 @@ for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do
         chmod 0644 $stamp
 done
 
+# Same for user lingering created by logind.
+for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do
+        chmod 0644 $username
+done
+
 # Convert /var/lib/machines subvolume to make it suitable for
 # rollbacks, if needed. See bsc#992573. The installer has been fixed
 # to create it at installation time.
@@ -764,7 +760,7 @@ fi >/dev/null
 
 %pretrans -n udev%{?mini} -p <lua>
 if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
-   posix.symlink("/lib/udev", "/usr/lib/udev")
+        posix.symlink("/lib/udev", "/usr/lib/udev")
 end
 
 %pre -n udev%{?mini}
@@ -797,7 +793,6 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 
 %postun -n udev%{?mini}
 %regenerate_initrd_post
-%insserv_cleanup
 systemctl daemon-reload || :
 # On package update: the restart of the socket units will probably
 # fail as the daemon is most likely running. It's not really an issue
@@ -1002,7 +997,6 @@ fi
 %dir %{_sysconfdir}/systemd/system
 %dir %{_sysconfdir}/systemd/user
 %dir %{_sysconfdir}/xdg/systemd
-%{_sysconfdir}/systemd/system/ctrl-alt-del.target
 %{_sysconfdir}/xdg/systemd/user
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
 
diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc
index 5b7980e5..a2cefb37 100644
--- a/systemd-rpmlintrc
+++ b/systemd-rpmlintrc
@@ -19,6 +19,7 @@ addFilter("libudev-mini.*shlib-policy-name-error.*")
 addFilter("nss-systemd.*shlib-policy-name-error.*")
 addFilter("nss-myhostname.*shlib-policy-name-error.*")
 addFilter("nss-mymachines.*shlib-policy-name-error.*")
+addFilter("nss-resolve.*shlib-policy-name-error.*")
 addFilter("systemd-logger.*useless-provides sysvinit(syslog).*")
 addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*")
 addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*")
diff --git a/systemd.changes b/systemd.changes
index b7ed294e..f0f16403 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com
+
+- Don't ship systemd-resolved for now (bsc#1024897)
+
+  If resolved is enabled , systemd-tmpfiles creates a wrong symlink in
+  /etc/resolv.conf which confuses the network manager actually used.
+
+-------------------------------------------------------------------
+Thu Feb  9 14:06:46 UTC 2017 - fbui@suse.com
+
+- More indentation cleanup (no functional changes)
+
+-------------------------------------------------------------------
+Wed Feb  8 08:45:09 CET 2017 - kukuk@suse.de
+
+- Remove obsolete insserv requirements for udev again [bsc#999841]
+
+-------------------------------------------------------------------
+Mon Feb  6 14:13:00 UTC 2017 - fbui@suse.com
+
+- Import commit cd97d5d5fef79ab9d957bf6504d085c0faca6bfc
+
+  e587b6ce0 disable RestrictAddressFamilies on all architectures but x86_64 one (bsc#1023460)
+  c8ae05632 journald: don't flush to /var/log/journal before we get asked to (bsc#1004094)
+  7261eaf3e sd-event: fix sd_event_source_get_priority() (#4712)
+
+-------------------------------------------------------------------
+Fri Feb  3 08:37:22 UTC 2017 - fbui@suse.com
+
+- Move fix for permission set on /var/lib/systemd/linger/* (no functional changes)
+
+  Move that part after the fix on timer timestamp files otherwise the
+  comment doesn't make sense.
+
+-------------------------------------------------------------------
+Wed Feb  1 15:06:06 UTC 2017 - fbui@suse.com
+
+- Import commit 028fd9b60580976dffb09b3576a2b652ee35137c
+
+  cc2ca55ff build-sys: do not install ctrl-alt-del.target symlink twice
+  ececae77a device: Avoid calling unit_free(NULL) in device setup logic (#4748)
+
+-------------------------------------------------------------------
+Wed Feb  1 14:32:28 UTC 2017 - fbui@suse.com
+
+- Ship systemd-resolved but it's disabled by default (bsc#1018387)
+
+  The NSS plugin will also be disabled, users need to enable it
+  manually.
+
 -------------------------------------------------------------------
 Wed Jan 25 15:37:23 UTC 2017 - fbui@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index c1a405c6..ec08a56d 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -228,7 +228,6 @@ Requires(pre):  /usr/sbin/groupadd
 Requires(pre):  /usr/bin/getent
 Requires(post): sed
 Requires(post): /usr/bin/systemctl
-Requires(postun): %insserv_prereq
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -397,9 +396,6 @@ Some systemd commands offer bash completion, but it is an optional dependency.
 
 %prep
 %setup -q -n systemd-%{version}
-echo "Checking whether upstream rpm macros changed..."
-#skipped for now
-#[ -z "`diff -Naru "%{S:10}" src/core/macros.systemd.in`" ] || exit 1
 
 # only needed for bootstrap
 %if 0%{?bootstrap}
@@ -541,9 +537,9 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.*
 
 # legacy links
 for f in loginctl journalctl ; do
-  ln -s $f %{buildroot}%{_bindir}/systemd-$f
+        ln -s $f %{buildroot}%{_bindir}/systemd-$f
 %if ! 0%{?bootstrap}
-  ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
+        ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
 %endif
 done
 ln -s /usr/lib/udev %{buildroot}/lib/udev
@@ -685,7 +681,7 @@ fi >/dev/null
 # since v207 /etc/sysctl.conf is no longer parsed, however
 # backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf
 if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then
-    ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
+        ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || :
 fi
 
 # migrate any symlink which may refer to the old path
@@ -704,11 +700,6 @@ enabled)  ;;
 *)        rm -f %{_prefix}/lib/systemd/system/tmp.mount
 esac
 
-# Same for user lingering created by logind.
-for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do
-        chmod 0644 $username
-done
-
 # v228 wrongly set world writable suid root permissions on timestamp
 # files used by permanent timers. Fix the timestamps that might have
 # been created by the affected versions of systemd (bsc#1020601).
@@ -716,6 +707,11 @@ for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do
         chmod 0644 $stamp
 done
 
+# Same for user lingering created by logind.
+for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do
+        chmod 0644 $username
+done
+
 # Convert /var/lib/machines subvolume to make it suitable for
 # rollbacks, if needed. See bsc#992573. The installer has been fixed
 # to create it at installation time.
@@ -762,7 +758,7 @@ fi >/dev/null
 
 %pretrans -n udev%{?mini} -p <lua>
 if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
-   posix.symlink("/lib/udev", "/usr/lib/udev")
+        posix.symlink("/lib/udev", "/usr/lib/udev")
 end
 
 %pre -n udev%{?mini}
@@ -795,7 +791,6 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 
 %postun -n udev%{?mini}
 %regenerate_initrd_post
-%insserv_cleanup
 systemctl daemon-reload || :
 # On package update: the restart of the socket units will probably
 # fail as the daemon is most likely running. It's not really an issue
@@ -1000,7 +995,6 @@ fi
 %dir %{_sysconfdir}/systemd/system
 %dir %{_sysconfdir}/systemd/user
 %dir %{_sysconfdir}/xdg/systemd
-%{_sysconfdir}/systemd/system/ctrl-alt-del.target
 %{_sysconfdir}/xdg/systemd/user
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh