diff --git a/lvm.conf b/lvm.conf
index bfe5162..e3804f9 100644
--- a/lvm.conf
+++ b/lvm.conf
@@ -204,7 +204,7 @@ global {
 
     # Local non-LV directory that holds file-based locks while commands are
     # in progress.  A directory like /tmp that may get wiped on reboot is OK.
-    locking_dir = "/var/lock/lvm"
+    locking_dir = "/run/lock/lvm"
 
     # Other entries can go here to allow you to load shared libraries
     # e.g. if support for LVM1 metadata was compiled as a shared library use
diff --git a/lvm2.changes b/lvm2.changes
index 9b3464f..6b46a7d 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 18 12:35:30 UTC 2012 - hrvoje.senjan@gmail.com
+
+- Change the default locking dir to reflect the change in filesystem package
+
 -------------------------------------------------------------------
 Wed Oct 17 23:01:54 UTC 2012 - nfbrown@suse.com
 
diff --git a/lvm2.spec b/lvm2.spec
index c3c53fd..dea17a5 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -109,7 +109,7 @@ export MODPROBE_CMD=/sbin/modprobe
 	--enable-cmdlib --enable-dmeventd \
 	--enable-realtime --enable-pkgconfig \
 	--enable-selinux \
-	--with-clvmd=corosync --datarootdir=/usr/share
+	--with-clvmd=corosync --datarootdir=/usr/share --with-default-locking-dir=/run/lock/lvm
 export SUSE_ASNEEDED=0
 make -j1 # symlinks are generated in parallel! %{?_smp_mflags}