diff --git a/python3-libmount.changes b/python3-libmount.changes
index 3cd9d53..cd0156f 100644
--- a/python3-libmount.changes
+++ b/python3-libmount.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 26 17:24:46 CEST 2018 - sbrabec@suse.com
+
+- Fix runstatedir path (to /run) (boo#1113188#c1).
+
 -------------------------------------------------------------------
 Fri Oct 12 14:06:56 CEST 2018 - sbrabec@suse.com
 
diff --git a/python3-libmount.spec b/python3-libmount.spec
index d0b6b20..9a10962 100644
--- a/python3-libmount.spec
+++ b/python3-libmount.spec
@@ -507,15 +507,12 @@ export SUID_LDFLAGS="-pie"
 export LDFLAGS="-Wl,-z,relro,-z,now"
 export CFLAGS="%{optflags} -D_GNU_SOURCE"
 export CXXFLAGS="%{optflags} -D_GNU_SOURCE"
-# override default localstatedir to /run
-# only used for volatile data
 #
 # SUSE now supports only systemd based system. We do not build
 # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
 AUTOPOINT=true autoreconf -vfi
 %configure \
   --disable-silent-rules \
-  --localstatedir=/run \
   --docdir=%{_docdir}/%{_name} \
   --disable-makeinstall-chown \
   --disable-makeinstall-setuid \
@@ -844,6 +841,11 @@ getent passwd uuidd >/dev/null || \
 %{service_add_pre uuidd.socket uuidd.service}
 
 %post -n uuidd
+# Fix running instance paths during live upgrade from
+# Leap = 15, SLE = 15 (boo#1113188).
+# Useful for Tumbleweed or zypper dup only.
+mv /run/run/uuidd /run/uuidd >/dev/null 2>&1 || :
+rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{service_add_post uuidd.socket uuidd.service}
 
 %preun -n uuidd
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index 3cd9d53..cd0156f 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 26 17:24:46 CEST 2018 - sbrabec@suse.com
+
+- Fix runstatedir path (to /run) (boo#1113188#c1).
+
 -------------------------------------------------------------------
 Fri Oct 12 14:06:56 CEST 2018 - sbrabec@suse.com
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index 888fefd..af1d93a 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -507,15 +507,12 @@ export SUID_LDFLAGS="-pie"
 export LDFLAGS="-Wl,-z,relro,-z,now"
 export CFLAGS="%{optflags} -D_GNU_SOURCE"
 export CXXFLAGS="%{optflags} -D_GNU_SOURCE"
-# override default localstatedir to /run
-# only used for volatile data
 #
 # SUSE now supports only systemd based system. We do not build
 # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
 AUTOPOINT=true autoreconf -vfi
 %configure \
   --disable-silent-rules \
-  --localstatedir=/run \
   --docdir=%{_docdir}/%{_name} \
   --disable-makeinstall-chown \
   --disable-makeinstall-setuid \
@@ -844,6 +841,11 @@ getent passwd uuidd >/dev/null || \
 %{service_add_pre uuidd.socket uuidd.service}
 
 %post -n uuidd
+# Fix running instance paths during live upgrade from
+# Leap = 15, SLE = 15 (boo#1113188).
+# Useful for Tumbleweed or zypper dup only.
+mv /run/run/uuidd /run/uuidd >/dev/null 2>&1 || :
+rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{service_add_post uuidd.socket uuidd.service}
 
 %preun -n uuidd
diff --git a/util-linux.changes b/util-linux.changes
index 3cd9d53..cd0156f 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 26 17:24:46 CEST 2018 - sbrabec@suse.com
+
+- Fix runstatedir path (to /run) (boo#1113188#c1).
+
 -------------------------------------------------------------------
 Fri Oct 12 14:06:56 CEST 2018 - sbrabec@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index 12b2153..2bf581d 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -507,15 +507,12 @@ export SUID_LDFLAGS="-pie"
 export LDFLAGS="-Wl,-z,relro,-z,now"
 export CFLAGS="%{optflags} -D_GNU_SOURCE"
 export CXXFLAGS="%{optflags} -D_GNU_SOURCE"
-# override default localstatedir to /run
-# only used for volatile data
 #
 # SUSE now supports only systemd based system. We do not build
 # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
 AUTOPOINT=true autoreconf -vfi
 %configure \
   --disable-silent-rules \
-  --localstatedir=/run \
   --docdir=%{_docdir}/%{_name} \
   --disable-makeinstall-chown \
   --disable-makeinstall-setuid \
@@ -844,6 +841,11 @@ getent passwd uuidd >/dev/null || \
 %{service_add_pre uuidd.socket uuidd.service}
 
 %post -n uuidd
+# Fix running instance paths during live upgrade from
+# Leap = 15, SLE = 15 (boo#1113188).
+# Useful for Tumbleweed or zypper dup only.
+mv /run/run/uuidd /run/uuidd >/dev/null 2>&1 || :
+rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{service_add_post uuidd.socket uuidd.service}
 
 %preun -n uuidd