diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 9fcfe84..c7d924d 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -19,7 +19,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	80%{?dist}.inferit
+Release:	82%{?dist}.inferit
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -329,6 +329,10 @@ if test ! -f ${EFI_HOME}/grub.cfg; then
     # there's no config in ESP, create one
     grub2-mkconfig -o ${EFI_HOME}/grub.cfg
     cp -a ${EFI_HOME}/grub.cfg ${EFI_HOME}/grub.cfg.rpmsave
+fi
+
+# need to move grub.cfg to correct dir for major version upgrade
+if ! grep -q "configfile" ${EFI_HOME}/grub.cfg; then
     cp -a ${EFI_HOME}/grub.cfg ${GRUB_HOME}/
 fi
 
@@ -523,8 +527,13 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
-* Fri Aug 16 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 2.06-80.inferit
-- Update to 2.06-80
+* Thu Jun 27 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-82
+- Bump to assign correct tag
+- Related: #RHEL-40362
+
+* Tue Jun 25 2024 Marta Lewandowska <mlewando@redhat.com> - 2.06-81
+- grub.cfg: Fix an issue when doing a major version upgrade
+- Resolves: #RHEL-40362
 
 * Tue May 28 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-80
 - Added more code for the previous CVE fix