diff --git a/grub2.spec b/grub2.spec
index 1a38d94..8493134 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -808,8 +808,13 @@ cd build-xen
 %make_install
 install -m 644 grub.xen %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/.
 # provide compatibility sym-link for VM definitions pointing to old location
-install -d %{buildroot}/%{_libdir}/%{name}/%{grubxenarch}
-ln -srf %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/grub.xen %{buildroot}/%{_libdir}/%{name}/%{grubxenarch}/grub.xen
+install -d %{buildroot}%{_libdir}/%{name}/%{grubxenarch}
+ln -srf %{buildroot}%{_datadir}/%{name}/%{grubxenarch}/grub.xen %{buildroot}%{_libdir}/%{name}/%{grubxenarch}/grub.xen
+cat <<-EoM >%{buildroot}%{_libdir}/%{name}/%{grubxenarch}/DEPRECATED
+	This directory and its contents was moved to %{_datadir}/%{name}/%{grubxenarch}.
+	Individual symbolic links are provided for a smooth transition.
+	Please update your VM definition files to use the new location!
+EoM
 cd ..
 %endif
 
@@ -823,7 +828,7 @@ install -m 644 grub.efi grub-tpm.efi %{buildroot}/%{_datadir}/%{name}/%{grubefia
 %define sysefibasedir %{_datadir}/efi
 %define sysefidir %{sysefibasedir}/%{_target_cpu} 
 install -d %{buildroot}/%{sysefidir}
-ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}/%{sysefidir}/grub.efi
+ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}%{sysefidir}/grub.efi
 %ifarch x86_64
 # provide compatibility sym-link for previous shim-install and the like
 install -d %{buildroot}/usr/lib64/efi
@@ -1274,12 +1279,12 @@ fi
 
 %ifarch %{ix86} x86_64
 %files %{grubxenarch}
+%defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/%{grubxenarch}
 %{_datadir}/%{name}/%{grubxenarch}/*
 # provide compatibility sym-link for VM definitions pointing to old location
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/%{grubxenarch}
-%{_libdir}/%{name}/%{grubxenarch}/grub.xen
+%dir %{_datadir}/%{name}
+%{_libdir}/%{name}/%{grubxenarch}
 %endif
 
 %if 0%{?has_systemd:1}