diff --git a/lockdev.spec b/lockdev.spec
index afffda6..25f05ab 100644
--- a/lockdev.spec
+++ b/lockdev.spec
@@ -1,7 +1,7 @@
 Summary: A library for locking devices
 Name: lockdev
 Version: 1.0.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://packages.debian.org/unstable/source/lockdev
@@ -26,6 +26,7 @@ Requires(postun): glibc
 
 BuildRequires: perl
 BuildRequires: perl(ExtUtils::MakeMaker)
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Lockdev provides a reliable way to put an exclusive lock to devices
@@ -61,6 +62,7 @@ cp %SOURCE1 ./docs
 make "CFLAGS=${RPM_OPT_FLAGS} -fPIC"
 
 %install
+rm -fr $RPM_BUILD_ROOT
 make \
     sbindir=${RPM_BUILD_ROOT}%{_sbindir} \
     libdir=${RPM_BUILD_ROOT}%{_libdir} \
@@ -72,7 +74,8 @@ make \
 mkdir -p $RPM_BUILD_ROOT/var/lock
 
 %pre
-groupadd -g 54 -r -f lock
+getent group lock >/dev/null || groupadd -g 54 -r -f lock
+exit 0
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -95,6 +98,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Thu Dec 03 2009 Jiri Popelka <jpopelka@redhat.com> - 1.0.1-20
+- Fixed pre section (http://fedoraproject.org/wiki/Packaging/UsersAndGroups)
+- Added back Buildroot to silence rpmlint's false positive
+
 * Tue Dec 01 2009 Jiri Popelka <jpopelka@redhat.com> - 1.0.1-19
 - Added license text to package