diff --git a/grub2.spec b/grub2.spec
index 8ca0bdc..02e6d18 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -54,6 +54,7 @@ BuildRequires:	texinfo
 Requires:	gettext os-prober which
 Requires(pre):  dracut
 Requires(post): dracut
+Conflicts:      filesystem < 3
 
 # TODO: ppc
 # ExclusiveArch:  %{ix86} x86_64 %{sparc}
@@ -67,6 +68,9 @@ file systems, computer architectures and hardware devices.
 %package efi
 Summary:	GRUB for EFI systems.
 Group:		System Environment/Base
+Requires(pre):  dracut
+Requires(post): dracut
+Conflicts:      filesystem < 3
 
 %description efi
 The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@@ -115,7 +119,7 @@ cd grub-efi-%{version}
 	TARGET_LDFLAGS=-static					\
         --with-platform=efi					\
         --program-transform-name=s,grub,%{name}-efi,		\
-        --sbindir=/sbin
+        --sbindir=%{_sbindir}
 make %{?_smp_mflags}
 %ifarch %{ix86}
 %define grubefiarch i386-efi
@@ -148,7 +152,7 @@ PLATFORM=pc
 	TARGET_LDFLAGS=-static					\
         --with-platform=$PLATFORM				\
         --program-transform-name=s,grub,%{name},		\
-        --sbindir=/sbin
+        --sbindir=%{_sbindir}
 
 make %{?_smp_mflags}
 
@@ -271,15 +275,15 @@ fi
 /etc/bash_completion.d/grub
 %{_libdir}/%{name}
 %{_libdir}/grub/
-/sbin/%{name}-mkconfig
-/sbin/%{name}-mkdevicemap
-/sbin/%{name}-mknetdir
-/sbin/%{name}-install
-/sbin/%{name}-probe
-/sbin/%{name}-reboot
-/sbin/%{name}-set-default
+%{_sbindir}/%{name}-mkconfig
+%{_sbindir}/%{name}-mkdevicemap
+%{_sbindir}/%{name}-mknetdir
+%{_sbindir}/%{name}-install
+%{_sbindir}/%{name}-probe
+%{_sbindir}/%{name}-reboot
+%{_sbindir}/%{name}-set-default
 %ifarch %{ix86} x86_64 %{sparc}
-/sbin/%{name}-setup
+%{_sbindir}/%{name}-setup
 %endif
 %{_bindir}/%{name}-bin2h
 %{_bindir}/%{name}-editenv
@@ -297,7 +301,7 @@ fi
 %{_bindir}/%{name}-mkrescue
 %endif
 %ifarch %{sparc}
-/sbin/%{name}-ofpathname
+%{_sbindir}/%{name}-ofpathname
 %endif
 %{_bindir}/%{name}-script-check
 %dir %{_sysconfdir}/grub.d
@@ -320,13 +324,13 @@ fi
 /etc/bash_completion.d/grub-efi
 %{_libdir}/grub2-efi
 %{_libdir}/grub/
-/sbin/grub2-efi-mkconfig
-/sbin/grub2-efi-mkdevicemap
-/sbin/grub2-efi-mknetdir
-/sbin/grub2-efi-install
-/sbin/grub2-efi-probe
-/sbin/grub2-efi-reboot
-/sbin/grub2-efi-set-default
+%{_sbindir}/grub2-efi-mkconfig
+%{_sbindir}/grub2-efi-mkdevicemap
+%{_sbindir}/grub2-efi-mknetdir
+%{_sbindir}/grub2-efi-install
+%{_sbindir}/grub2-efi-probe
+%{_sbindir}/grub2-efi-reboot
+%{_sbindir}/grub2-efi-set-default
 #/sbin/grub2-efi-setup
 %{_bindir}/grub2-efi-bin2h
 %{_bindir}/grub2-efi-editenv
@@ -344,7 +348,7 @@ fi
 %{_bindir}/grub2-efi-mkrescue
 %endif
 %ifarch %{sparc} ppc ppc64
-/sbin/grub2-efi-ofpathname
+%{_sbindir}/grub2-efi-ofpathname
 %endif
 %{_bindir}/grub2-efi-script-check
 %dir %{_sysconfdir}/grub.d