diff --git a/lockdev.spec b/lockdev.spec
index 46af9ed..11b7943 100644
--- a/lockdev.spec
+++ b/lockdev.spec
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -59,7 +59,7 @@ This package contains the static version of the lockdev library.
 cp %SOURCE1 ./docs
 
 %build
-make "CFLAGS=${RPM_OPT_FLAGS} -fPIC"
+make "CFLAGS=${RPM_OPT_FLAGS} -fPIC -D_PATH_LOCK=\\\"/var/lock/lockdev\\\""
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -71,7 +71,7 @@ make \
         install
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
 
-mkdir -p $RPM_BUILD_ROOT/var/lock
+mkdir -p $RPM_BUILD_ROOT/var/lock/lockdev
 
 %pre
 getent group lock >/dev/null || groupadd -g 54 -r -f lock
@@ -86,6 +86,7 @@ rm -fr $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE AUTHORS ChangeLog ChangeLog.old
+%dir %attr(0775,root,lock) /var/lock/lockdev
 %attr(2711,root,lock)  %{_sbindir}/lockdev
 %{_libdir}/*.so.*
 %{_mandir}/man8/*
@@ -101,6 +102,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Mon Apr 19 2010 Jiri Popelka <jpopelka@redhat.com> - 1.0.3-5
+- Change directory for lock files from /var/lock to /var/lock/lockdev (#581884)
+
 * Thu Jan 21 2010 Jiri Popelka <jpopelka@redhat.com> - 1.0.3-4
 - create -static subpackage to ship static library separately
 - update lockdev.8 manpage