diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz
index e4e3a8a2..904a437e 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:b5bb6b2c38604d082aa1afc46bbb24476142826474e7bf1be8bb85a50117893e
-size 3211232
+oid sha256:a0f63b20f91eeed656a9d2bf9ad453cd7cfbb786663714b9b17886624f5ea69c
+size 3211060
diff --git a/systemd-mini.changes b/systemd-mini.changes
index 3ac654cc..ac7b0364 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Jan 10 10:54:20 UTC 2017 - fbui@suse.com
+
+- Import commit 3edb876e3b80437a95502aa5d31d454606ea94bd
+
+  27b544224 core: make sure to not call device_is_bound_by_mounts() when dev is null (#5033) (bsc#1018399)
+
+-------------------------------------------------------------------
+Fri Jan  6 08:27:03 UTC 2017 - fbui@suse.com
+
+- Use the %{resolved} build conditional for the nss-resolve subpackage
+
+-------------------------------------------------------------------
+Thu Jan  5 17:46:44 UTC 2017 - fbui@suse.com
+
+- /usr/bin/systemd-resolve was missing from the filelist
+
+-------------------------------------------------------------------
+Thu Jan  5 17:09:01 UTC 2017 - fbui@suse.com
+
+- Silent warnings emitted when udev socket units are restarted during package upgrade (bsc#1018214)
+
 -------------------------------------------------------------------
 Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 17d28609..0ea7287b 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-mini
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -314,21 +314,6 @@ users. (See the DynamicUser= setting in unit files.)
 To activate this NSS module, you will need to include it in
 /etc/nsswitch.conf, see nss-systemd(8) manpage for more details.
 
-%package -n nss-resolve
-Summary:        Plugin for local hostname resolution via systemd-resolved
-License:        LGPL-2.1+
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description -n nss-resolve
-This package contains a plug-in module for the Name Service Switch
-(NSS), which enables host name resolutions via the systemd-resolved(8)
-local network name resolution service. It replaces the nss-dns plug-in
-module that traditionally resolves hostnames via DNS.
-
-To activate this NSS module, you will need to include it in
-/etc/nsswitch.conf, see nss-resolve(8) manpage for more details.
-
 %package -n nss-myhostname
 Summary:        Plugin for local system host name resolution
 License:        LGPL-2.1+
@@ -345,6 +330,23 @@ To activate this NSS module, you will need to include it in
 /etc/nsswitch.conf, see nss-hostname(8) manpage for more details.
 %endif
 
+%if %{with resolved}
+%package -n nss-resolve
+Summary:        Plugin for local hostname resolution via systemd-resolved
+License:        LGPL-2.1+
+Group:          System/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description -n nss-resolve
+This package contains a plug-in module for the Name Service Switch
+(NSS), which enables host name resolutions via the systemd-resolved(8)
+local network name resolution service. It replaces the nss-dns plug-in
+module that traditionally resolves hostnames via DNS.
+
+To activate this NSS module, you will need to include it in
+/etc/nsswitch.conf, see nss-resolve(8) manpage for more details.
+%endif
+
 %if %{with machined}
 %package -n nss-mymachines
 Summary:        Plugin for local virtual host name resolution
@@ -783,7 +785,13 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 %regenerate_initrd_post
 %insserv_cleanup
 systemctl daemon-reload || :
-%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket systemd-udevd.service
+# 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
+# since we restart systemd-udevd right after and that will pull in the
+# socket units again. We should be informed at that time if something
+# really went wrong the first time we started the socket units.
+%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null
+%systemd_postun_with_restart systemd-udevd.service
 
 %posttrans -n udev%{?mini}
 %regenerate_initrd_posttrans
@@ -882,6 +890,9 @@ fi
 %{_bindir}/systemd-tmpfiles
 %{_bindir}/systemd-machine-id-setup
 %{_bindir}/systemd-nspawn
+%if %{with resolved}
+%{_bindir}/systemd-resolve
+%endif
 %{_bindir}/systemd-socket-activate
 %{_bindir}/systemd-stdio-bridge
 %{_bindir}/systemd-detect-virt
diff --git a/systemd.changes b/systemd.changes
index 3ac654cc..ac7b0364 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Jan 10 10:54:20 UTC 2017 - fbui@suse.com
+
+- Import commit 3edb876e3b80437a95502aa5d31d454606ea94bd
+
+  27b544224 core: make sure to not call device_is_bound_by_mounts() when dev is null (#5033) (bsc#1018399)
+
+-------------------------------------------------------------------
+Fri Jan  6 08:27:03 UTC 2017 - fbui@suse.com
+
+- Use the %{resolved} build conditional for the nss-resolve subpackage
+
+-------------------------------------------------------------------
+Thu Jan  5 17:46:44 UTC 2017 - fbui@suse.com
+
+- /usr/bin/systemd-resolve was missing from the filelist
+
+-------------------------------------------------------------------
+Thu Jan  5 17:09:01 UTC 2017 - fbui@suse.com
+
+- Silent warnings emitted when udev socket units are restarted during package upgrade (bsc#1018214)
+
 -------------------------------------------------------------------
 Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index cf2e2a0e..5b84fd7a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -312,21 +312,6 @@ users. (See the DynamicUser= setting in unit files.)
 To activate this NSS module, you will need to include it in
 /etc/nsswitch.conf, see nss-systemd(8) manpage for more details.
 
-%package -n nss-resolve
-Summary:        Plugin for local hostname resolution via systemd-resolved
-License:        LGPL-2.1+
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description -n nss-resolve
-This package contains a plug-in module for the Name Service Switch
-(NSS), which enables host name resolutions via the systemd-resolved(8)
-local network name resolution service. It replaces the nss-dns plug-in
-module that traditionally resolves hostnames via DNS.
-
-To activate this NSS module, you will need to include it in
-/etc/nsswitch.conf, see nss-resolve(8) manpage for more details.
-
 %package -n nss-myhostname
 Summary:        Plugin for local system host name resolution
 License:        LGPL-2.1+
@@ -343,6 +328,23 @@ To activate this NSS module, you will need to include it in
 /etc/nsswitch.conf, see nss-hostname(8) manpage for more details.
 %endif
 
+%if %{with resolved}
+%package -n nss-resolve
+Summary:        Plugin for local hostname resolution via systemd-resolved
+License:        LGPL-2.1+
+Group:          System/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description -n nss-resolve
+This package contains a plug-in module for the Name Service Switch
+(NSS), which enables host name resolutions via the systemd-resolved(8)
+local network name resolution service. It replaces the nss-dns plug-in
+module that traditionally resolves hostnames via DNS.
+
+To activate this NSS module, you will need to include it in
+/etc/nsswitch.conf, see nss-resolve(8) manpage for more details.
+%endif
+
 %if %{with machined}
 %package -n nss-mymachines
 Summary:        Plugin for local virtual host name resolution
@@ -781,7 +783,13 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
 %regenerate_initrd_post
 %insserv_cleanup
 systemctl daemon-reload || :
-%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket systemd-udevd.service
+# 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
+# since we restart systemd-udevd right after and that will pull in the
+# socket units again. We should be informed at that time if something
+# really went wrong the first time we started the socket units.
+%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null
+%systemd_postun_with_restart systemd-udevd.service
 
 %posttrans -n udev%{?mini}
 %regenerate_initrd_posttrans
@@ -880,6 +888,9 @@ fi
 %{_bindir}/systemd-tmpfiles
 %{_bindir}/systemd-machine-id-setup
 %{_bindir}/systemd-nspawn
+%if %{with resolved}
+%{_bindir}/systemd-resolve
+%endif
 %{_bindir}/systemd-socket-activate
 %{_bindir}/systemd-stdio-bridge
 %{_bindir}/systemd-detect-virt