diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz
index 04c9ac5d..c4376ce7 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:779b3b2be558de7e7ceed64da90953fff303332750105987206584f777225bb5
+size 3212260
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..d6669a32 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+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..b34999dc 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -33,18 +33,19 @@
 %bcond_with     machined
 %bcond_with     importd
 %bcond_with     networkd
+%bcond_with     resolved
 %bcond_with     journal_remote
 %else
 %bcond_without  sysvcompat
 %bcond_without  machined
 %bcond_without  importd
 %bcond_without  networkd
+%bcond_without  resolved
 %bcond_without  journal_remote
 %ifarch %{ix86} x86_64
 %bcond_without  gnuefi
 %endif
 %endif
-%bcond_with     resolved
 %bcond_with     parentpathid
 
 Name:           systemd-mini
@@ -706,11 +707,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 +714,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.
@@ -1002,7 +1003,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..d6669a32 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+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..c1526823 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -31,18 +31,19 @@
 %bcond_with     machined
 %bcond_with     importd
 %bcond_with     networkd
+%bcond_with     resolved
 %bcond_with     journal_remote
 %else
 %bcond_without  sysvcompat
 %bcond_without  machined
 %bcond_without  importd
 %bcond_without  networkd
+%bcond_without  resolved
 %bcond_without  journal_remote
 %ifarch %{ix86} x86_64
 %bcond_without  gnuefi
 %endif
 %endif
-%bcond_with     resolved
 %bcond_with     parentpathid
 
 Name:           systemd
@@ -704,11 +705,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 +712,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.
@@ -1000,7 +1001,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