diff --git a/srcpkgs/grub2/files/grub.default b/srcpkgs/grub/files/grub.default
similarity index 100%
rename from srcpkgs/grub2/files/grub.default
rename to srcpkgs/grub/files/grub.default
diff --git a/srcpkgs/grub2/grub2-devel.template b/srcpkgs/grub/grub-devel.template
similarity index 100%
rename from srcpkgs/grub2/grub2-devel.template
rename to srcpkgs/grub/grub-devel.template
diff --git a/srcpkgs/grub2/template b/srcpkgs/grub/template
similarity index 58%
rename from srcpkgs/grub2/template
rename to srcpkgs/grub/template
index 39a4acd26d..f1876469fc 100644
--- a/srcpkgs/grub2/template
+++ b/srcpkgs/grub/template
@@ -1,14 +1,13 @@
-# Template file for 'grub2'
-pkgname=grub2
-version=1.97.1
-wrksrc=grub-$version
+# Template file for 'grub'
+pkgname=grub
+version=1.97.2
 distfiles="ftp://alpha.gnu.org/gnu/grub/grub-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-grub-emu --enable-grub-emu-usb
  --enable-grub-fstest --enable-grub-pe2elf --enable-grub-mkfont"
 short_desc="GRand Unified Bootloader 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=51f04517a3eb730a0f66e68cf5b0e376f6a073899b4405b2ac14667825f937bf
+checksum=98c1d2623ce809ec25ba9136ea59c15a4580c71478d122be765e819cb06a1c49
 long_desc="
  This is GRUB 2, the second version of the GRand Unified Bootloader.
  GRUB 2 is rewritten from scratch to make GNU GRUB cleaner, safer, more
@@ -16,12 +15,17 @@ long_desc="
 
 conf_files="/etc/default/grub /etc/grub.d/40_custom"
 
-Add_dependency full	glibc
-Add_dependency build	bison
-Add_dependency full	libusb-compat
-Add_dependency build	ncurses
-Add_dependency full	freetype
-Add_dependency build	ruby
+Add_dependency run glibc
+Add_dependency run zlib
+Add_dependency run libusb-compat
+Add_dependency run ncurses-libs
+Add_dependency run freetype
+Add_dependency build bison
+Add_dependency build zlib-devel
+Add_dependency build libusb-compat-devel
+Add_dependency build ncurses-devel
+Add_dependency build freetype-devel
+Add_dependency build ruby
 
 post_install()
 {