diff --git a/grub.spec b/grub.spec
index 5183602..4013584 100644
--- a/grub.spec
+++ b/grub.spec
@@ -18,6 +18,7 @@ Requires: mktemp
 Requires: system-logos
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Conflicts: grub2
+Conflicts: filesystem < 3
 
 URL: http://www.gnu.org/software/%{name}/
 Source0: ftp://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
@@ -63,7 +64,7 @@ if [ "$GCCVERS" == "4" ]; then
 	CFLAGS="$CFLAGS -Wno-pointer-sign"
 fi
 export CFLAGS
-%configure --sbindir=/sbin --disable-auto-linux-mem-opt --datarootdir=%{_datadir} --with-platform=efi
+%configure --sbindir=%{_sbindir} --disable-auto-linux-mem-opt --datarootdir=%{_datadir} --with-platform=efi
 make
 mv efi/grub.efi .
 make clean
@@ -71,12 +72,12 @@ autoreconf
 autoconf
 CFLAGS="$CFLAGS -static" 
 export CFLAGS
-%configure --sbindir=/sbin --disable-auto-linux-mem-opt --datarootdir=%{_datadir}
+%configure --sbindir=%{_sbindir} --disable-auto-linux-mem-opt --datarootdir=%{_datadir}
 make
 
 %install
 rm -fr $RPM_BUILD_ROOT
-%makeinstall sbindir=${RPM_BUILD_ROOT}/sbin
+%makeinstall
 mkdir -p ${RPM_BUILD_ROOT}/boot/grub
 mkdir -m 0755 -p ${RPM_BUILD_ROOT}/boot/efi/EFI/redhat/
 install -m 755 grub.efi ${RPM_BUILD_ROOT}/boot/efi/EFI/redhat/grub.efi
@@ -102,11 +103,11 @@ fi
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS README COPYING TODO docs/menu.lst
 /boot/grub
-/sbin/grub
-/sbin/grub-install
-/sbin/grub-terminfo
-/sbin/grub-md5-crypt
-/sbin/grub-crypt
+%{_sbindir}/grub
+%{_sbindir}/grub-install
+%{_sbindir}/grub-terminfo
+%{_sbindir}/grub-md5-crypt
+%{_sbindir}/grub-crypt
 %{_bindir}/mbchk
 %{_infodir}/grub*
 %{_infodir}/multiboot*
@@ -116,9 +117,9 @@ fi
 %files efi
 %defattr(-,root,root)
 %attr(0755,root,root)/boot/efi/EFI/redhat
-/sbin/grub-terminfo
-/sbin/grub-md5-crypt
-/sbin/grub-crypt
+%{_sbindir}/grub-terminfo
+%{_sbindir}/grub-md5-crypt
+%{_sbindir}/grub-crypt
 
 %changelog
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.97-84