diff --git a/grub/PKGBUILD b/grub/PKGBUILD
index 5f5dadf281..7a0c6c4adc 100644
--- a/grub/PKGBUILD
+++ b/grub/PKGBUILD
@@ -42,11 +42,10 @@ esac
 pkgname='grub'
 pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
-_tag='bb59f566e1e5c387dbfd342bb3767f761422c744' # git rev-parse grub-${_pkgver}
-_pkgver=2.12rc1
-_unifont_ver='15.1.02'
+_pkgver=2.12
+_unifont_ver='15.1.05'
 pkgver=${_pkgver/-/}
-pkgrel=5.1
+pkgrel=2
 url='https://www.gnu.org/software/grub/'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 license=('GPL-3.0-or-later')
@@ -72,6 +71,7 @@ optdepends=('freetype2: For grub-mkfont usage'
 	    'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
 	    'mtools: For grub-mkrescue FAT FS support')
 
+options=(!debug)
 
 if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
     makedepends+=('libusbx' 'sdl')
@@ -83,7 +83,7 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' S
 	      'BE5C23209ACDDACEB20DB0A28C8189F1988C2166'  # Daniel Kiper <dkiper@net-space.pl>
 	      '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
 
-source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
+source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed"
 	'git+https://git.savannah.gnu.org/git/gnulib.git'
 	"https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
 	'0001-00_header-add-GRUB_COLOR_-variables.patch'
@@ -94,9 +94,9 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
 	'grub.default'
 	'sbat.csv')
 
-sha256sums=('SKIP'
+sha256sums=('304d5c0d506d3aaab496bdcbfc325b89fc83348aeb9e69d7b6a928f4051bedb2'
             'SKIP'
-            '912834ab9cd372f300541894615f910af4db82477c91b236674057eadfc76429'
+            '8ea5b5a14d71e3353d1fea373f5d88d198ad1e285cedd8294655926ee11fd91d'
             'SKIP'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
             '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'