diff --git a/util-linux.changes b/util-linux.changes
index 19f0687..d1f4778 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 13 10:45:54 CET 2014 - fcrozat@suse.com
+
+- Ensure localstatedir value used by configure is /run (changed to that
+  value upstream since 2012).
+
 -------------------------------------------------------------------
 Fri Jan 10 13:08:45 UTC 2014 - werner@suse.de
 
diff --git a/util-linux.spec b/util-linux.spec
index 8faf5c7..9c8f185 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -266,7 +266,10 @@ fi
 autoreconf -fi
 export SUID_CFLAGS="-fpie"
 export SUID_LDFLAGS="-pie"
+# override default localstatedir to /run
+# only used for volatile data
 %configure \
+  --localstatedir=/run \
   --docdir=%{_docdir}/%{name} \
   --with-audit \
   --with-gnu-ld \
@@ -330,7 +333,7 @@ fi
 %install
 mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}}
 mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid/
-mkdir -p %{buildroot}%{_localstatedir}/run/uuidd/
+mkdir -p %{buildroot}/run/uuidd/
 install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd
 install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf
 install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login
@@ -915,7 +918,7 @@ fi
 %verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd
 %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid
 %ghost %{_localstatedir}/lib/libuuid/clock.txt
-%attr(-,uuidd,uuidd) %ghost %dir %{_localstatedir}/run/uuidd
+%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
 %{_initddir}/uuidd
 %{_mandir}/man8/uuidd.8.gz
 %{_sbindir}/rcuuidd