diff --git a/lvm2.spec b/lvm2.spec
index 4cf7ea6..9a00f58 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -52,7 +52,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.96
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -107,12 +107,13 @@ or more physical volumes and creating one or more logical volumes
 %patch1 -p1 -b .upstream
 
 %build
+%define _default_pid_dir /run
 %define _default_dm_run_dir /run
 %define _default_run_dir /run/lvm
 %define _default_locking_dir /run/lock/lvm
 
 %if %{enable_udev}
-%define _udevbasedir /lib/udev
+%define _udevbasedir %{_prefix}/lib/udev
 %define _udevdir %{_udevbasedir}/rules.d
 %define configure_udev --with-udevdir=%{_udevdir} --enable-udev_sync
 %endif
@@ -125,7 +126,7 @@ or more physical volumes and creating one or more logical volumes
 %define configure_lvmetad --enable-lvmetad
 %endif
 
-%configure --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-lvm1_fallback --enable-fsadm --with-pool=internal --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd %{configure_cluster} %{configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_lvmetad}
+%configure --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-lvm1_fallback --enable-fsadm --with-pool=internal --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd %{configure_cluster} %{configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_lvmetad}
 
 make %{?_smp_mflags}
 
@@ -418,8 +419,6 @@ fi
 %attr(755,root,root) /usr/sbin/clvmd
 %{_mandir}/man8/clvmd.8.gz
 %{_sysconfdir}/rc.d/init.d/clvmd
-#%ghost %{_localstatedir}/run/lvm/clvmd.sock
-#%ghost %{_localstatedir}/run/clvmd.pid
 
 %endif
 
@@ -453,7 +452,6 @@ fi
 %attr(755,root,root) /usr/sbin/cmirrord
 %{_mandir}/man8/cmirrord.8.gz
 %{_sysconfdir}/rc.d/init.d/cmirrord
-#%ghost %{_localstatedir}/run/cmirrord.pid
 
 %endif
 %endif
@@ -602,7 +600,6 @@ fi
 %{_unitdir}/dm-event.socket
 %{_unitdir}/dm-event.service
 %endif
-#%ghost %{_localstatedir}/run/dmeventd.pid
 
 %package -n device-mapper-event-libs
 Summary: Device-mapper event daemon shared library
@@ -621,8 +618,6 @@ libdevmapper-event.
 
 %files -n device-mapper-event-libs
 %attr(755,root,root) %{_libdir}/libdevmapper-event.so.*
-#%ghost %{_localstatedir}/run/dmeventd-client
-#%ghost %{_localstatedir}/run/dmeventd-server
 
 %package -n device-mapper-event-devel
 Summary: Development libraries and headers for the device-mapper event daemon
@@ -644,6 +639,10 @@ the device-mapper event library.
 %{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Wed Jul 04 2012 Peter Rajnoha <prajnoha@redhat.com> - 2.02.96-3
+- Use configure --with-default-pid-dir=/run.
+- Use globally set prefix for udev rules path.
+
 * Mon Jul 02 2012 Peter Rajnoha <prajnoha@redhat.com> - 2.02.96-2
 - Compile with lvmetad support enabled.
 - Add support for volume autoactivation using lvmetad.